Fixed TC1800 - xhmtl instead of plain text for name attribute

5 files changed, 378 insertions, 266 deletions

diff --git a/org.eclipse.rmf.reqif10.tests/src/org/eclipse/rmf/reqif10/tests/uc001/tc1200/TC1200FormatedContentModelBuilder.java b/org.eclipse.rmf.reqif10.tests/src/org/eclipse/rmf/reqif10/tests/uc001/tc1200/TC1200FormatedContentModelBuilder.java
index 2214d3bb..6df4d356 100644
--- a/org.eclipse.rmf.reqif10.tests/src/org/eclipse/rmf/reqif10/tests/uc001/tc1200/TC1200FormatedContentModelBuilder.java
+++ b/org.eclipse.rmf.reqif10.tests/src/org/eclipse/rmf/reqif10/tests/uc001/tc1200/TC1200FormatedContentModelBuilder.java
@@ -191,252 +191,298 @@ public class TC1200FormatedContentModelBuilder extends SimpleModelBuilder {
 
 		// level 1 / top level
 		// create fill XhtmlDivType in XhtmlContent.div at original value
-		description = "xhtml.p.type_the_original_value";
-		xhtmlLevel1 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlPType(), true);
-		specObject = createSpecObject(description, ReqIF10Package.eINSTANCE.getAttributeValueXHTML_TheOriginalValue(), xhtmlLevel1);
-		description = "xhtml.p.type";
-		xhtmlLevel1 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlPType(), true);
-		specObject = createSpecObject(description, ReqIF10Package.eINSTANCE.getAttributeValueXHTML_TheValue(), xhtmlLevel1);
-		getReqIF().getCoreContent().getSpecObjects().add(specObject);
-
-		// create fill XhtmlDivType in XhtmlContent.div at original value
-		description = "xhtml.div.type_the_original_value";
-		xhtmlLevel1 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDivType(), true);
-		specObject = createSpecObject(description, ReqIF10Package.eINSTANCE.getAttributeValueXHTML_TheOriginalValue(), xhtmlLevel1);
-		description = "xhtml.div.type";
-		xhtmlLevel1 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDivType(), true);
-		specObject = createSpecObject(description, ReqIF10Package.eINSTANCE.getAttributeValueXHTML_TheValue(), xhtmlLevel1);
-		getReqIF().getCoreContent().getSpecObjects().add(specObject);
-
-		// level 2
-		// objects that are contained on xhtml.p.type
-		createSpecObjectWithPXhtml("xhtml.br.type", XhtmlPackage.eINSTANCE.getXhtmlPType_Br(), XhtmlPackage.eINSTANCE.getXhtmlBrType());
-		createSpecObjectWithPXhtml("xhtml.span.type", XhtmlPackage.eINSTANCE.getXhtmlPType_Span(), XhtmlPackage.eINSTANCE.getXhtmlSpanType());
-		createSpecObjectWithPXhtml("xhtml.em.type", XhtmlPackage.eINSTANCE.getXhtmlPType_Em(), XhtmlPackage.eINSTANCE.getXhtmlEmType());
-		createSpecObjectWithPXhtml("xhtml.strong.type", XhtmlPackage.eINSTANCE.getXhtmlPType_Strong(), XhtmlPackage.eINSTANCE.getXhtmlStrongType());
-		createSpecObjectWithPXhtml("xhtml.dfn.type", XhtmlPackage.eINSTANCE.getXhtmlPType_Dfn(), XhtmlPackage.eINSTANCE.getXhtmlDfnType());
-		createSpecObjectWithPXhtml("xhtml.code.type", XhtmlPackage.eINSTANCE.getXhtmlPType_Code(), XhtmlPackage.eINSTANCE.getXhtmlCodeType());
-		createSpecObjectWithPXhtml("xhtml.samp.type", XhtmlPackage.eINSTANCE.getXhtmlPType_Samp(), XhtmlPackage.eINSTANCE.getXhtmlSampType());
-		createSpecObjectWithPXhtml("xhtml.kbd.type", XhtmlPackage.eINSTANCE.getXhtmlPType_Kbd(), XhtmlPackage.eINSTANCE.getXhtmlKbdType());
-		createSpecObjectWithPXhtml("xhtml.var.type", XhtmlPackage.eINSTANCE.getXhtmlPType_Var(), XhtmlPackage.eINSTANCE.getXhtmlVarType());
-		createSpecObjectWithPXhtml("xhtml.cite.type", XhtmlPackage.eINSTANCE.getXhtmlPType_Cite(), XhtmlPackage.eINSTANCE.getXhtmlCiteType());
-		createSpecObjectWithPXhtml("xhtml.abbr.type", XhtmlPackage.eINSTANCE.getXhtmlPType_Abbr(), XhtmlPackage.eINSTANCE.getXhtmlAbbrType());
-		createSpecObjectWithPXhtml("xhtml.acronym.type", XhtmlPackage.eINSTANCE.getXhtmlPType_Acronym(), XhtmlPackage.eINSTANCE.getXhtmlAcronymType());
-		createSpecObjectWithPXhtml("xhtml.q.type", XhtmlPackage.eINSTANCE.getXhtmlPType_Q(), XhtmlPackage.eINSTANCE.getXhtmlQType());
-		createSpecObjectWithPXhtml("xhtml.inl.pres.type", XhtmlPackage.eINSTANCE.getXhtmlPType_Tt(), XhtmlPackage.eINSTANCE.getXhtmlInlPresType());
-		createSpecObjectWithPXhtml("xhtml.a.type", XhtmlPackage.eINSTANCE.getXhtmlPType_A(), XhtmlPackage.eINSTANCE.getXhtmlAType());
-		createSpecObjectWithPXhtml("xhtml.object.type", XhtmlPackage.eINSTANCE.getXhtmlPType_Object(), XhtmlPackage.eINSTANCE.getXhtmlObjectType());
-		createSpecObjectWithPXhtml("xhtml.edit.type", XhtmlPackage.eINSTANCE.getXhtmlPType_Ins(), XhtmlPackage.eINSTANCE.getXhtmlEditType());
-
-		// first level objects that are contained in xhtml.div.type and are not already covered by xhtml.p.type
-		createSpecObjectWithDivXhtml("xhtml.h1.type", XhtmlPackage.eINSTANCE.getXhtmlDivType_H1(), XhtmlPackage.eINSTANCE.getXhtmlH1Type());
-		createSpecObjectWithDivXhtml("xhtml.h2.type", XhtmlPackage.eINSTANCE.getXhtmlDivType_H2(), XhtmlPackage.eINSTANCE.getXhtmlH2Type());
-		createSpecObjectWithDivXhtml("xhtml.h3.type", XhtmlPackage.eINSTANCE.getXhtmlDivType_H3(), XhtmlPackage.eINSTANCE.getXhtmlH3Type());
-		createSpecObjectWithDivXhtml("xhtml.h4.type", XhtmlPackage.eINSTANCE.getXhtmlDivType_H4(), XhtmlPackage.eINSTANCE.getXhtmlH4Type());
-		createSpecObjectWithDivXhtml("xhtml.h5.type", XhtmlPackage.eINSTANCE.getXhtmlDivType_H5(), XhtmlPackage.eINSTANCE.getXhtmlH5Type());
-		createSpecObjectWithDivXhtml("xhtml.h6.type", XhtmlPackage.eINSTANCE.getXhtmlDivType_H6(), XhtmlPackage.eINSTANCE.getXhtmlH6Type());
-		createSpecObjectWithDivXhtml("xhtml.ul.type", XhtmlPackage.eINSTANCE.getXhtmlDivType_Ul(), XhtmlPackage.eINSTANCE.getXhtmlUlType());
-		createSpecObjectWithDivXhtml("xhtml.ol.type", XhtmlPackage.eINSTANCE.getXhtmlDivType_Ol(), XhtmlPackage.eINSTANCE.getXhtmlOlType());
-		createSpecObjectWithDivXhtml("xhtml.dl.type", XhtmlPackage.eINSTANCE.getXhtmlDivType_Dl(), XhtmlPackage.eINSTANCE.getXhtmlDlType());
-		createSpecObjectWithDivXhtml("xhtml.pre.type", XhtmlPackage.eINSTANCE.getXhtmlDivType_Pre(), XhtmlPackage.eINSTANCE.getXhtmlPreType());
-		createSpecObjectWithDivXhtml("xhtml.blockquote.type", XhtmlPackage.eINSTANCE.getXhtmlDivType_Blockquote(),
-				XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType());
-		createSpecObjectWithDivXhtml("xhtml.address.type", XhtmlPackage.eINSTANCE.getXhtmlDivType_Address(),
-				XhtmlPackage.eINSTANCE.getXhtmlAddressType());
-		createSpecObjectWithDivXhtml("xhtml.hr.type", XhtmlPackage.eINSTANCE.getXhtmlDivType_Hr(), XhtmlPackage.eINSTANCE.getXhtmlHrType());
-		createSpecObjectWithDivXhtml("xhtml.table.type", XhtmlPackage.eINSTANCE.getXhtmlDivType_Table(), XhtmlPackage.eINSTANCE.getXhtmlTableType());
-
-		// level 3
-		// xhtml.li.type
-		description = "xhtml.li.type";
-		xhtmlLevel1 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDivType(), false);
-		specObject = createSpecObject(description, ReqIF10Package.eINSTANCE.getAttributeValueXHTML_TheValue(), xhtmlLevel1);
-		getReqIF().getCoreContent().getSpecObjects().add(specObject);
-
-		xhtmlLevel2 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlUlType(), false);
-		setValue(xhtmlLevel1, XhtmlPackage.eINSTANCE.getXhtmlDivType_Ul(), xhtmlLevel2);
-
-		xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlLiType(), true);
-		setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlUlType_Li(), xhtmlLevel3);
-
-		// xhtml.dt.type
-		description = "xhtml.dt.type";
-		xhtmlLevel1 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDivType(), false);
-		specObject = createSpecObject(description, ReqIF10Package.eINSTANCE.getAttributeValueXHTML_TheValue(), xhtmlLevel1);
-		getReqIF().getCoreContent().getSpecObjects().add(specObject);
-
-		xhtmlLevel2 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDlType(), false);
-		setValue(xhtmlLevel1, XhtmlPackage.eINSTANCE.getXhtmlDivType_Dl(), xhtmlLevel2);
-
-		xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDtType(), true);
-		setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlDlType_Dt(), xhtmlLevel3);
-
-		xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDdType(), false);
-		setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlDlType_Dd(), xhtmlLevel3);
-
-		// xhtml.dd.type
-		description = "xhtml.dd.type";
-		xhtmlLevel1 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDivType(), false);
-		specObject = createSpecObject(description, ReqIF10Package.eINSTANCE.getAttributeValueXHTML_TheValue(), xhtmlLevel1);
-		getReqIF().getCoreContent().getSpecObjects().add(specObject);
-
-		xhtmlLevel2 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDlType(), false);
-		setValue(xhtmlLevel1, XhtmlPackage.eINSTANCE.getXhtmlDivType_Dl(), xhtmlLevel2);
-
-		xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDtType(), false);
-		setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlDlType_Dt(), xhtmlLevel3);
-
-		xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDdType(), true);
-		setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlDlType_Dd(), xhtmlLevel3);
-
-		// xhtml.caption.type
-		description = "xhtml.caption.type";
-		xhtmlLevel1 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDivType(), false);
-		specObject = createSpecObject(description, ReqIF10Package.eINSTANCE.getAttributeValueXHTML_TheValue(), xhtmlLevel1);
-		getReqIF().getCoreContent().getSpecObjects().add(specObject);
-
-		xhtmlLevel2 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTableType(), false);
-		setValue(xhtmlLevel1, XhtmlPackage.eINSTANCE.getXhtmlDivType_Table(), xhtmlLevel2);
-
-		xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlCaptionType(), true);
-		setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlTableType_Caption(), xhtmlLevel3);
-
-		// xhtml.thead.type
-		description = "xhtml.thead.type";
-		xhtmlLevel1 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDivType(), false);
-		specObject = createSpecObject(description, ReqIF10Package.eINSTANCE.getAttributeValueXHTML_TheValue(), xhtmlLevel1);
-		getReqIF().getCoreContent().getSpecObjects().add(specObject);
-
-		xhtmlLevel2 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTableType(), false);
-		((XhtmlTableType) xhtmlLevel2).getTr().clear();
-		setValue(xhtmlLevel1, XhtmlPackage.eINSTANCE.getXhtmlDivType_Table(), xhtmlLevel2);
-
-		xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTheadType(), true);
-		setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlTableType_Thead(), xhtmlLevel3);
-
-		xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTbodyType(), false);
-		setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlTableType_Tbody(), xhtmlLevel3);
-
-		xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTfootType(), false);
-		setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlTableType_Tfoot(), xhtmlLevel3);
-
-		// xhtml.col.type
-		description = "xhtml.col.type";
-		xhtmlLevel1 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDivType(), false);
-		specObject = createSpecObject(description, ReqIF10Package.eINSTANCE.getAttributeValueXHTML_TheValue(), xhtmlLevel1);
-		getReqIF().getCoreContent().getSpecObjects().add(specObject);
-
-		xhtmlLevel2 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTableType(), false);
-		setValue(xhtmlLevel1, XhtmlPackage.eINSTANCE.getXhtmlDivType_Table(), xhtmlLevel2);
-
-		xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlColType(), true);
-		setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlTableType_Col(), xhtmlLevel3);
+		// description = "xhtml.p.type_the_original_value";
+		// xhtmlLevel1 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlPType(), true);
+		// specObject = createSpecObject(description,
+		// ReqIF10Package.eINSTANCE.getAttributeValueXHTML_TheOriginalValue(), xhtmlLevel1);
 
-		// xhtml.colgroup.type
-		description = "xhtml.colgroup.type";
-		xhtmlLevel1 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDivType(), false);
-		specObject = createSpecObject(description, ReqIF10Package.eINSTANCE.getAttributeValueXHTML_TheValue(), xhtmlLevel1);
-		getReqIF().getCoreContent().getSpecObjects().add(specObject);
-
-		xhtmlLevel2 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTableType(), false);
-		setValue(xhtmlLevel1, XhtmlPackage.eINSTANCE.getXhtmlDivType_Table(), xhtmlLevel2);
-
-		xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlColgroupType(), true);
-		setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlTableType_Colgroup(), xhtmlLevel3);
-
-		// xhtml.tfoot.type
-		description = "xhtml.tfoot.type";
-		xhtmlLevel1 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDivType(), false);
-		specObject = createSpecObject(description, ReqIF10Package.eINSTANCE.getAttributeValueXHTML_TheValue(), xhtmlLevel1);
-		getReqIF().getCoreContent().getSpecObjects().add(specObject);
-
-		xhtmlLevel2 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTableType(), false);
-		((XhtmlTableType) xhtmlLevel2).getTr().clear();
-		setValue(xhtmlLevel1, XhtmlPackage.eINSTANCE.getXhtmlDivType_Table(), xhtmlLevel2);
-
-		xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTheadType(), false);
-		setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlTableType_Thead(), xhtmlLevel3);
-
-		xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTbodyType(), false);
-		setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlTableType_Tbody(), xhtmlLevel3);
-
-		xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTfootType(), true);
-		setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlTableType_Tfoot(), xhtmlLevel3);
-
-		// xhtml.tbody.type
-		description = "xhtml.tbody.type";
-		xhtmlLevel1 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDivType(), false);
-		specObject = createSpecObject(description, ReqIF10Package.eINSTANCE.getAttributeValueXHTML_TheValue(), xhtmlLevel1);
-		getReqIF().getCoreContent().getSpecObjects().add(specObject);
-
-		xhtmlLevel2 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTableType(), false);
-		((XhtmlTableType) xhtmlLevel2).getTr().clear();
-		setValue(xhtmlLevel1, XhtmlPackage.eINSTANCE.getXhtmlDivType_Table(), xhtmlLevel2);
-
-		xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTheadType(), false);
-		setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlTableType_Thead(), xhtmlLevel3);
-
-		xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTbodyType(), true);
-		setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlTableType_Tbody(), xhtmlLevel3);
-
-		xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTfootType(), false);
-		setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlTableType_Tfoot(), xhtmlLevel3);
-
-		// xhtml.tr.type
-		description = "xhtml.tr.type";
-		xhtmlLevel1 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDivType(), false);
-		specObject = createSpecObject(description, ReqIF10Package.eINSTANCE.getAttributeValueXHTML_TheValue(), xhtmlLevel1);
-		getReqIF().getCoreContent().getSpecObjects().add(specObject);
-
-		xhtmlLevel2 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTableType(), false);
-		setValue(xhtmlLevel1, XhtmlPackage.eINSTANCE.getXhtmlDivType_Table(), xhtmlLevel2);
-
-		xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTrType(), true);
-		setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlTableType_Tr(), xhtmlLevel3);
-
-		// xhtml.param.type
-		description = "xhtml.param.type";
-		xhtmlLevel1 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDivType(), false);
-		specObject = createSpecObject(description, ReqIF10Package.eINSTANCE.getAttributeValueXHTML_TheValue(), xhtmlLevel1);
-		getReqIF().getCoreContent().getSpecObjects().add(specObject);
-
-		xhtmlLevel2 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlObjectType(), false);
-		setValue(xhtmlLevel1, XhtmlPackage.eINSTANCE.getXhtmlDivType_Object(), xhtmlLevel2);
-
-		xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlParamType(), true);
-		setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlObjectType_Param(), xhtmlLevel3);
-
-		// level 4
-		// xhtml.td.type
-		description = "xhtml.td.type";
-		xhtmlLevel1 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDivType(), false);
-		specObject = createSpecObject(description, ReqIF10Package.eINSTANCE.getAttributeValueXHTML_TheValue(), xhtmlLevel1);
-		getReqIF().getCoreContent().getSpecObjects().add(specObject);
-
-		xhtmlLevel2 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTableType(), false);
-		setValue(xhtmlLevel1, XhtmlPackage.eINSTANCE.getXhtmlDivType_Table(), xhtmlLevel2);
-
-		xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTrType(), false);
-		setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlTableType_Tr(), xhtmlLevel3);
-
-		xhtmlLevel4 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTdType(), true);
-		setValue(xhtmlLevel3, XhtmlPackage.eINSTANCE.getXhtmlTrType_Td(), xhtmlLevel4);
-
-		// xhtml.th.type
-		description = "xhtml.th.type";
-		xhtmlLevel1 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDivType(), false);
+		description = "xhtml.p.type";
+		xhtmlLevel1 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlPType(), false);
 		specObject = createSpecObject(description, ReqIF10Package.eINSTANCE.getAttributeValueXHTML_TheValue(), xhtmlLevel1);
 		getReqIF().getCoreContent().getSpecObjects().add(specObject);
-
-		xhtmlLevel2 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTableType(), false);
-		setValue(xhtmlLevel1, XhtmlPackage.eINSTANCE.getXhtmlDivType_Table(), xhtmlLevel2);
-
-		xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTrType(), false);
-		setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlTableType_Tr(), xhtmlLevel3);
-
-		xhtmlLevel4 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlThType(), true);
-		setValue(xhtmlLevel3, XhtmlPackage.eINSTANCE.getXhtmlTrType_Th(), xhtmlLevel4);
-
+		//
+		// // create fill XhtmlDivType in XhtmlContent.div at original value
+		// description = "xhtml.div.type_the_original_value";
+		// xhtmlLevel1 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDivType(), true);
+		// specObject = createSpecObject(description,
+		// ReqIF10Package.eINSTANCE.getAttributeValueXHTML_TheOriginalValue(), xhtmlLevel1);
+		// description = "xhtml.div.type";
+		// xhtmlLevel1 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDivType(), true);
+		// specObject = createSpecObject(description, ReqIF10Package.eINSTANCE.getAttributeValueXHTML_TheValue(),
+		// xhtmlLevel1);
+		// getReqIF().getCoreContent().getSpecObjects().add(specObject);
+		//
+		// // level 2
+		// // objects that are contained on xhtml.p.type
+		// createSpecObjectWithPXhtml("xhtml.br.type", XhtmlPackage.eINSTANCE.getXhtmlPType_Br(),
+		// XhtmlPackage.eINSTANCE.getXhtmlBrType());
+		// createSpecObjectWithPXhtml("xhtml.span.type", XhtmlPackage.eINSTANCE.getXhtmlPType_Span(),
+		// XhtmlPackage.eINSTANCE.getXhtmlSpanType());
+		// createSpecObjectWithPXhtml("xhtml.em.type", XhtmlPackage.eINSTANCE.getXhtmlPType_Em(),
+		// XhtmlPackage.eINSTANCE.getXhtmlEmType());
+		// createSpecObjectWithPXhtml("xhtml.strong.type", XhtmlPackage.eINSTANCE.getXhtmlPType_Strong(),
+		// XhtmlPackage.eINSTANCE.getXhtmlStrongType());
+		// createSpecObjectWithPXhtml("xhtml.dfn.type", XhtmlPackage.eINSTANCE.getXhtmlPType_Dfn(),
+		// XhtmlPackage.eINSTANCE.getXhtmlDfnType());
+		// createSpecObjectWithPXhtml("xhtml.code.type", XhtmlPackage.eINSTANCE.getXhtmlPType_Code(),
+		// XhtmlPackage.eINSTANCE.getXhtmlCodeType());
+		// createSpecObjectWithPXhtml("xhtml.samp.type", XhtmlPackage.eINSTANCE.getXhtmlPType_Samp(),
+		// XhtmlPackage.eINSTANCE.getXhtmlSampType());
+		// createSpecObjectWithPXhtml("xhtml.kbd.type", XhtmlPackage.eINSTANCE.getXhtmlPType_Kbd(),
+		// XhtmlPackage.eINSTANCE.getXhtmlKbdType());
+		// createSpecObjectWithPXhtml("xhtml.var.type", XhtmlPackage.eINSTANCE.getXhtmlPType_Var(),
+		// XhtmlPackage.eINSTANCE.getXhtmlVarType());
+		// createSpecObjectWithPXhtml("xhtml.cite.type", XhtmlPackage.eINSTANCE.getXhtmlPType_Cite(),
+		// XhtmlPackage.eINSTANCE.getXhtmlCiteType());
+		// createSpecObjectWithPXhtml("xhtml.abbr.type", XhtmlPackage.eINSTANCE.getXhtmlPType_Abbr(),
+		// XhtmlPackage.eINSTANCE.getXhtmlAbbrType());
+		// createSpecObjectWithPXhtml("xhtml.acronym.type", XhtmlPackage.eINSTANCE.getXhtmlPType_Acronym(),
+		// XhtmlPackage.eINSTANCE.getXhtmlAcronymType());
+		// createSpecObjectWithPXhtml("xhtml.q.type", XhtmlPackage.eINSTANCE.getXhtmlPType_Q(),
+		// XhtmlPackage.eINSTANCE.getXhtmlQType());
+		// createSpecObjectWithPXhtml("xhtml.inl.pres.type", XhtmlPackage.eINSTANCE.getXhtmlPType_Tt(),
+		// XhtmlPackage.eINSTANCE.getXhtmlInlPresType());
+		// createSpecObjectWithPXhtml("xhtml.a.type", XhtmlPackage.eINSTANCE.getXhtmlPType_A(),
+		// XhtmlPackage.eINSTANCE.getXhtmlAType());
+		// createSpecObjectWithPXhtml("xhtml.object.type", XhtmlPackage.eINSTANCE.getXhtmlPType_Object(),
+		// XhtmlPackage.eINSTANCE.getXhtmlObjectType());
+		// createSpecObjectWithPXhtml("xhtml.edit.type", XhtmlPackage.eINSTANCE.getXhtmlPType_Ins(),
+		// XhtmlPackage.eINSTANCE.getXhtmlEditType());
+		//
+		// // first level objects that are contained in xhtml.div.type and are not already covered by xhtml.p.type
+		// createSpecObjectWithDivXhtml("xhtml.h1.type", XhtmlPackage.eINSTANCE.getXhtmlDivType_H1(),
+		// XhtmlPackage.eINSTANCE.getXhtmlH1Type());
+		// createSpecObjectWithDivXhtml("xhtml.h2.type", XhtmlPackage.eINSTANCE.getXhtmlDivType_H2(),
+		// XhtmlPackage.eINSTANCE.getXhtmlH2Type());
+		// createSpecObjectWithDivXhtml("xhtml.h3.type", XhtmlPackage.eINSTANCE.getXhtmlDivType_H3(),
+		// XhtmlPackage.eINSTANCE.getXhtmlH3Type());
+		// createSpecObjectWithDivXhtml("xhtml.h4.type", XhtmlPackage.eINSTANCE.getXhtmlDivType_H4(),
+		// XhtmlPackage.eINSTANCE.getXhtmlH4Type());
+		// createSpecObjectWithDivXhtml("xhtml.h5.type", XhtmlPackage.eINSTANCE.getXhtmlDivType_H5(),
+		// XhtmlPackage.eINSTANCE.getXhtmlH5Type());
+		// createSpecObjectWithDivXhtml("xhtml.h6.type", XhtmlPackage.eINSTANCE.getXhtmlDivType_H6(),
+		// XhtmlPackage.eINSTANCE.getXhtmlH6Type());
+		// createSpecObjectWithDivXhtml("xhtml.ul.type", XhtmlPackage.eINSTANCE.getXhtmlDivType_Ul(),
+		// XhtmlPackage.eINSTANCE.getXhtmlUlType());
+		// createSpecObjectWithDivXhtml("xhtml.ol.type", XhtmlPackage.eINSTANCE.getXhtmlDivType_Ol(),
+		// XhtmlPackage.eINSTANCE.getXhtmlOlType());
+		// createSpecObjectWithDivXhtml("xhtml.dl.type", XhtmlPackage.eINSTANCE.getXhtmlDivType_Dl(),
+		// XhtmlPackage.eINSTANCE.getXhtmlDlType());
+		// createSpecObjectWithDivXhtml("xhtml.pre.type", XhtmlPackage.eINSTANCE.getXhtmlDivType_Pre(),
+		// XhtmlPackage.eINSTANCE.getXhtmlPreType());
+		// createSpecObjectWithDivXhtml("xhtml.blockquote.type", XhtmlPackage.eINSTANCE.getXhtmlDivType_Blockquote(),
+		// XhtmlPackage.eINSTANCE.getXhtmlBlockquoteType());
+		// createSpecObjectWithDivXhtml("xhtml.address.type", XhtmlPackage.eINSTANCE.getXhtmlDivType_Address(),
+		// XhtmlPackage.eINSTANCE.getXhtmlAddressType());
+		// createSpecObjectWithDivXhtml("xhtml.hr.type", XhtmlPackage.eINSTANCE.getXhtmlDivType_Hr(),
+		// XhtmlPackage.eINSTANCE.getXhtmlHrType());
+		// createSpecObjectWithDivXhtml("xhtml.table.type", XhtmlPackage.eINSTANCE.getXhtmlDivType_Table(),
+		// XhtmlPackage.eINSTANCE.getXhtmlTableType());
+		//
+		// // level 3
+		// // xhtml.li.type
+		// description = "xhtml.li.type";
+		// xhtmlLevel1 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDivType(), false);
+		// specObject = createSpecObject(description, ReqIF10Package.eINSTANCE.getAttributeValueXHTML_TheValue(),
+		// xhtmlLevel1);
+		// getReqIF().getCoreContent().getSpecObjects().add(specObject);
+		//
+		// xhtmlLevel2 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlUlType(), false);
+		// setValue(xhtmlLevel1, XhtmlPackage.eINSTANCE.getXhtmlDivType_Ul(), xhtmlLevel2);
+		//
+		// xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlLiType(), true);
+		// setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlUlType_Li(), xhtmlLevel3);
+		//
+		// // xhtml.dt.type
+		// description = "xhtml.dt.type";
+		// xhtmlLevel1 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDivType(), false);
+		// specObject = createSpecObject(description, ReqIF10Package.eINSTANCE.getAttributeValueXHTML_TheValue(),
+		// xhtmlLevel1);
+		// getReqIF().getCoreContent().getSpecObjects().add(specObject);
+		//
+		// xhtmlLevel2 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDlType(), false);
+		// setValue(xhtmlLevel1, XhtmlPackage.eINSTANCE.getXhtmlDivType_Dl(), xhtmlLevel2);
+		//
+		// xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDtType(), true);
+		// setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlDlType_Dt(), xhtmlLevel3);
+		//
+		// xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDdType(), false);
+		// setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlDlType_Dd(), xhtmlLevel3);
+		//
+		// // xhtml.dd.type
+		// description = "xhtml.dd.type";
+		// xhtmlLevel1 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDivType(), false);
+		// specObject = createSpecObject(description, ReqIF10Package.eINSTANCE.getAttributeValueXHTML_TheValue(),
+		// xhtmlLevel1);
+		// getReqIF().getCoreContent().getSpecObjects().add(specObject);
+		//
+		// xhtmlLevel2 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDlType(), false);
+		// setValue(xhtmlLevel1, XhtmlPackage.eINSTANCE.getXhtmlDivType_Dl(), xhtmlLevel2);
+		//
+		// xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDtType(), false);
+		// setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlDlType_Dt(), xhtmlLevel3);
+		//
+		// xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDdType(), true);
+		// setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlDlType_Dd(), xhtmlLevel3);
+		//
+		// // xhtml.caption.type
+		// description = "xhtml.caption.type";
+		// xhtmlLevel1 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDivType(), false);
+		// specObject = createSpecObject(description, ReqIF10Package.eINSTANCE.getAttributeValueXHTML_TheValue(),
+		// xhtmlLevel1);
+		// getReqIF().getCoreContent().getSpecObjects().add(specObject);
+		//
+		// xhtmlLevel2 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTableType(), false);
+		// setValue(xhtmlLevel1, XhtmlPackage.eINSTANCE.getXhtmlDivType_Table(), xhtmlLevel2);
+		//
+		// xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlCaptionType(), true);
+		// setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlTableType_Caption(), xhtmlLevel3);
+		//
+		// // xhtml.thead.type
+		// description = "xhtml.thead.type";
+		// xhtmlLevel1 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDivType(), false);
+		// specObject = createSpecObject(description, ReqIF10Package.eINSTANCE.getAttributeValueXHTML_TheValue(),
+		// xhtmlLevel1);
+		// getReqIF().getCoreContent().getSpecObjects().add(specObject);
+		//
+		// xhtmlLevel2 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTableType(), false);
+		// ((XhtmlTableType) xhtmlLevel2).getTr().clear();
+		// setValue(xhtmlLevel1, XhtmlPackage.eINSTANCE.getXhtmlDivType_Table(), xhtmlLevel2);
+		//
+		// xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTheadType(), true);
+		// setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlTableType_Thead(), xhtmlLevel3);
+		//
+		// xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTbodyType(), false);
+		// setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlTableType_Tbody(), xhtmlLevel3);
+		//
+		// xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTfootType(), false);
+		// setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlTableType_Tfoot(), xhtmlLevel3);
+		//
+		// // xhtml.col.type
+		// description = "xhtml.col.type";
+		// xhtmlLevel1 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDivType(), false);
+		// specObject = createSpecObject(description, ReqIF10Package.eINSTANCE.getAttributeValueXHTML_TheValue(),
+		// xhtmlLevel1);
+		// getReqIF().getCoreContent().getSpecObjects().add(specObject);
+		//
+		// xhtmlLevel2 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTableType(), false);
+		// setValue(xhtmlLevel1, XhtmlPackage.eINSTANCE.getXhtmlDivType_Table(), xhtmlLevel2);
+		//
+		// xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlColType(), true);
+		// setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlTableType_Col(), xhtmlLevel3);
+		//
+		// // xhtml.colgroup.type
+		// description = "xhtml.colgroup.type";
+		// xhtmlLevel1 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDivType(), false);
+		// specObject = createSpecObject(description, ReqIF10Package.eINSTANCE.getAttributeValueXHTML_TheValue(),
+		// xhtmlLevel1);
+		// getReqIF().getCoreContent().getSpecObjects().add(specObject);
+		//
+		// xhtmlLevel2 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTableType(), false);
+		// setValue(xhtmlLevel1, XhtmlPackage.eINSTANCE.getXhtmlDivType_Table(), xhtmlLevel2);
+		//
+		// xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlColgroupType(), true);
+		// setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlTableType_Colgroup(), xhtmlLevel3);
+		//
+		// // xhtml.tfoot.type
+		// description = "xhtml.tfoot.type";
+		// xhtmlLevel1 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDivType(), false);
+		// specObject = createSpecObject(description, ReqIF10Package.eINSTANCE.getAttributeValueXHTML_TheValue(),
+		// xhtmlLevel1);
+		// getReqIF().getCoreContent().getSpecObjects().add(specObject);
+		//
+		// xhtmlLevel2 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTableType(), false);
+		// ((XhtmlTableType) xhtmlLevel2).getTr().clear();
+		// setValue(xhtmlLevel1, XhtmlPackage.eINSTANCE.getXhtmlDivType_Table(), xhtmlLevel2);
+		//
+		// xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTheadType(), false);
+		// setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlTableType_Thead(), xhtmlLevel3);
+		//
+		// xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTbodyType(), false);
+		// setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlTableType_Tbody(), xhtmlLevel3);
+		//
+		// xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTfootType(), true);
+		// setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlTableType_Tfoot(), xhtmlLevel3);
+		//
+		// // xhtml.tbody.type
+		// description = "xhtml.tbody.type";
+		// xhtmlLevel1 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDivType(), false);
+		// specObject = createSpecObject(description, ReqIF10Package.eINSTANCE.getAttributeValueXHTML_TheValue(),
+		// xhtmlLevel1);
+		// getReqIF().getCoreContent().getSpecObjects().add(specObject);
+		//
+		// xhtmlLevel2 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTableType(), false);
+		// ((XhtmlTableType) xhtmlLevel2).getTr().clear();
+		// setValue(xhtmlLevel1, XhtmlPackage.eINSTANCE.getXhtmlDivType_Table(), xhtmlLevel2);
+		//
+		// xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTheadType(), false);
+		// setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlTableType_Thead(), xhtmlLevel3);
+		//
+		// xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTbodyType(), true);
+		// setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlTableType_Tbody(), xhtmlLevel3);
+		//
+		// xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTfootType(), false);
+		// setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlTableType_Tfoot(), xhtmlLevel3);
+		//
+		// // xhtml.tr.type
+		// description = "xhtml.tr.type";
+		// xhtmlLevel1 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDivType(), false);
+		// specObject = createSpecObject(description, ReqIF10Package.eINSTANCE.getAttributeValueXHTML_TheValue(),
+		// xhtmlLevel1);
+		// getReqIF().getCoreContent().getSpecObjects().add(specObject);
+		//
+		// xhtmlLevel2 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTableType(), false);
+		// setValue(xhtmlLevel1, XhtmlPackage.eINSTANCE.getXhtmlDivType_Table(), xhtmlLevel2);
+		//
+		// xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTrType(), true);
+		// setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlTableType_Tr(), xhtmlLevel3);
+		//
+		// // xhtml.param.type
+		// description = "xhtml.param.type";
+		// xhtmlLevel1 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDivType(), false);
+		// specObject = createSpecObject(description, ReqIF10Package.eINSTANCE.getAttributeValueXHTML_TheValue(),
+		// xhtmlLevel1);
+		// getReqIF().getCoreContent().getSpecObjects().add(specObject);
+		//
+		// xhtmlLevel2 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlObjectType(), false);
+		// setValue(xhtmlLevel1, XhtmlPackage.eINSTANCE.getXhtmlDivType_Object(), xhtmlLevel2);
+		//
+		// xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlParamType(), true);
+		// setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlObjectType_Param(), xhtmlLevel3);
+		//
+		// // level 4
+		// // xhtml.td.type
+		// description = "xhtml.td.type";
+		// xhtmlLevel1 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDivType(), false);
+		// specObject = createSpecObject(description, ReqIF10Package.eINSTANCE.getAttributeValueXHTML_TheValue(),
+		// xhtmlLevel1);
+		// getReqIF().getCoreContent().getSpecObjects().add(specObject);
+		//
+		// xhtmlLevel2 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTableType(), false);
+		// setValue(xhtmlLevel1, XhtmlPackage.eINSTANCE.getXhtmlDivType_Table(), xhtmlLevel2);
+		//
+		// xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTrType(), false);
+		// setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlTableType_Tr(), xhtmlLevel3);
+		//
+		// xhtmlLevel4 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTdType(), true);
+		// setValue(xhtmlLevel3, XhtmlPackage.eINSTANCE.getXhtmlTrType_Td(), xhtmlLevel4);
+		//
+		// // xhtml.th.type
+		// description = "xhtml.th.type";
+		// xhtmlLevel1 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlDivType(), false);
+		// specObject = createSpecObject(description, ReqIF10Package.eINSTANCE.getAttributeValueXHTML_TheValue(),
+		// xhtmlLevel1);
+		// getReqIF().getCoreContent().getSpecObjects().add(specObject);
+		//
+		// xhtmlLevel2 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTableType(), false);
+		// setValue(xhtmlLevel1, XhtmlPackage.eINSTANCE.getXhtmlDivType_Table(), xhtmlLevel2);
+		//
+		// xhtmlLevel3 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlTrType(), false);
+		// setValue(xhtmlLevel2, XhtmlPackage.eINSTANCE.getXhtmlTableType_Tr(), xhtmlLevel3);
+		//
+		// xhtmlLevel4 = createXhtmlInstance(XhtmlPackage.eINSTANCE.getXhtmlThType(), true);
+		// setValue(xhtmlLevel3, XhtmlPackage.eINSTANCE.getXhtmlTrType_Th(), xhtmlLevel4);
+		//
 	}
 
 	private void createSpecObjectWithPXhtml(String description, EReference eReference, EClass targetType) throws Exception {
@@ -490,8 +536,8 @@ public class TC1200FormatedContentModelBuilder extends SimpleModelBuilder {
 
 	private EObject createXhtmlInstance(EClass eClass, boolean createAll) {
 		EObject eObject = EcoreUtil.create(eClass);
-		setAttributes(eObject, createAll);
-		setSubElements(eObject, createAll);
+		// setAttributes(eObject, createAll);
+		// setSubElements(eObject, createAll);
 		setMixedText(eObject, createAll);
 
 		return eObject;
diff --git a/org.eclipse.rmf.reqif10.tests/src/org/eclipse/rmf/reqif10/tests/uc003/tc18xx/TC1800HISExchangeProcessModelBuilder.java b/org.eclipse.rmf.reqif10.tests/src/org/eclipse/rmf/reqif10/tests/uc003/tc18xx/TC1800HISExchangeProcessModelBuilder.java
index e66bb7d0..c857df6c 100644
--- a/org.eclipse.rmf.reqif10.tests/src/org/eclipse/rmf/reqif10/tests/uc003/tc18xx/TC1800HISExchangeProcessModelBuilder.java
+++ b/org.eclipse.rmf.reqif10.tests/src/org/eclipse/rmf/reqif10/tests/uc003/tc18xx/TC1800HISExchangeProcessModelBuilder.java
@@ -3,13 +3,21 @@ package org.eclipse.rmf.reqif10.tests.uc003.tc18xx;
 import java.math.BigInteger;
 
 import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.util.FeatureMap;
+import org.eclipse.emf.ecore.util.FeatureMapUtil;
 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.DatatypeDefinition;
 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;
@@ -18,8 +26,11 @@ 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.reqif10.tests.util.CommonSystemAttributes;
 import org.eclipse.rmf.reqif10.tests.util.SimpleModelBuilder;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlFactory;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlPType;
 
 @SuppressWarnings("nls")
 public class TC1800HISExchangeProcessModelBuilder extends SimpleModelBuilder implements CommonSystemAttributes {
@@ -28,11 +39,12 @@ public class TC1800HISExchangeProcessModelBuilder extends SimpleModelBuilder imp
 
 	// datatypes
 	protected DatatypeDefinitionString datatypeDefinitionString;
+	protected DatatypeDefinitionXHTML datatypeDefinitionXhtml;
 	protected DatatypeDefinitionEnumeration datatypeDefinitionEnumeration;
 
 	// SpecObjectTypes
 	SpecObjectType specObjectType;
-	AttributeDefinitionString specObjectTypeAttributeDefinitionStringName;
+	AttributeDefinitionXHTML specObjectTypeAttributeDefinitionXhtmlName;
 	AttributeDefinitionString specObjectTypeAttributeDefinitionStringA1;
 	AttributeDefinitionString specObjectTypeAttributeDefinitionStringA2;
 	AttributeDefinitionEnumeration specObjectTypeAttributeDefinitionEnumerationE1;
@@ -72,8 +84,14 @@ public class TC1800HISExchangeProcessModelBuilder extends SimpleModelBuilder imp
 		datatypeDefinitionString.setLastChange(toDate(LAST_CHANGE_STRING_0));
 		datatypeDefinitionString.setMaxLength(new BigInteger("255"));
 
+		datatypeDefinitionXhtml = ReqIF10Factory.eINSTANCE.createDatatypeDefinitionXHTML();
+		datatypeDefinitionXhtml.setIdentifier("ID_TC18xx_DatatypeDefinitionXhtml");
+		datatypeDefinitionXhtml.setLongName("TC18xx DatatypeDefinitionXhtml");
+		datatypeDefinitionXhtml.setLastChange(toDate(LAST_CHANGE_STRING_0));
+
 		EList<DatatypeDefinition> datatypes = getReqIF().getCoreContent().getDatatypes();
 		datatypes.add(datatypeDefinitionString);
+		datatypes.add(datatypeDefinitionXhtml);
 
 		one = ReqIF10Factory.eINSTANCE.createEnumValue();
 		one.setIdentifier("ID_TC18xx_EnumValue_one");
@@ -111,11 +129,11 @@ public class TC1800HISExchangeProcessModelBuilder extends SimpleModelBuilder imp
 		specObjectType.setLongName("TC18xx SpecObjectType");
 		specObjectType.setLastChange(toDate(LAST_CHANGE_STRING_0));
 
-		specObjectTypeAttributeDefinitionStringName = ReqIF10Factory.eINSTANCE.createAttributeDefinitionString();
-		specObjectTypeAttributeDefinitionStringName.setIdentifier("ID_TC18xx_SpecObjectTypeAttributeDefinitionString_" + REQIF_NAME);
-		specObjectTypeAttributeDefinitionStringName.setLongName(REQIF_NAME);
-		specObjectTypeAttributeDefinitionStringName.setLastChange(toDate(LAST_CHANGE_STRING_0));
-		specObjectTypeAttributeDefinitionStringName.setType(datatypeDefinitionString);
+		specObjectTypeAttributeDefinitionXhtmlName = ReqIF10Factory.eINSTANCE.createAttributeDefinitionXHTML();
+		specObjectTypeAttributeDefinitionXhtmlName.setIdentifier("ID_TC18xx_SpecObjectTypeAttributeDefinitionXhtml_" + REQIF_NAME);
+		specObjectTypeAttributeDefinitionXhtmlName.setLongName(REQIF_NAME);
+		specObjectTypeAttributeDefinitionXhtmlName.setLastChange(toDate(LAST_CHANGE_STRING_0));
+		specObjectTypeAttributeDefinitionXhtmlName.setType(datatypeDefinitionXhtml);
 
 		specObjectTypeAttributeDefinitionStringA1 = ReqIF10Factory.eINSTANCE.createAttributeDefinitionString();
 		specObjectTypeAttributeDefinitionStringA1.setIdentifier("ID_TC18xx_A1");
@@ -136,7 +154,7 @@ public class TC1800HISExchangeProcessModelBuilder extends SimpleModelBuilder imp
 		specObjectTypeAttributeDefinitionEnumerationE1.setType(datatypeDefinitionEnumeration);
 		specObjectTypeAttributeDefinitionEnumerationE1.setMultiValued(false);
 
-		specObjectType.getSpecAttributes().add(specObjectTypeAttributeDefinitionStringName);
+		specObjectType.getSpecAttributes().add(specObjectTypeAttributeDefinitionXhtmlName);
 		specObjectType.getSpecAttributes().add(specObjectTypeAttributeDefinitionStringA1);
 		specObjectType.getSpecAttributes().add(specObjectTypeAttributeDefinitionStringA2);
 		specObjectType.getSpecAttributes().add(specObjectTypeAttributeDefinitionEnumerationE1);
@@ -168,6 +186,7 @@ public class TC1800HISExchangeProcessModelBuilder extends SimpleModelBuilder imp
 	 */
 	private void createBasicSpecObject(SpecObject specObject, String objectId, String a1, String a2, EnumValue e1) throws Exception {
 		AttributeValueString attributeValueString;
+		AttributeValueXHTML attributeValueXhtml;
 		AttributeValueEnumeration attributeValueEnum;
 
 		specObject = ReqIF10Factory.eINSTANCE.createSpecObject();
@@ -175,10 +194,10 @@ public class TC1800HISExchangeProcessModelBuilder extends SimpleModelBuilder imp
 		specObject.setLastChange(toDate(LAST_CHANGE_STRING_0));
 		specObject.setType(specObjectType);
 
-		attributeValueString = ReqIF10Factory.eINSTANCE.createAttributeValueString();
-		attributeValueString.setDefinition(specObjectTypeAttributeDefinitionStringName);
-		attributeValueString.setTheValue("Obj-" + objectId);
-		specObject.getValues().add(attributeValueString);
+		attributeValueXhtml = ReqIF10Factory.eINSTANCE.createAttributeValueXHTML();
+		attributeValueXhtml.setDefinition(specObjectTypeAttributeDefinitionXhtmlName);
+		attributeValueXhtml.setTheValue(createXhtmlValue("Obj-" + objectId));
+		specObject.getValues().add(attributeValueXhtml);
 
 		attributeValueString = ReqIF10Factory.eINSTANCE.createAttributeValueString();
 		attributeValueString.setDefinition(specObjectTypeAttributeDefinitionStringA1);
@@ -199,6 +218,27 @@ public class TC1800HISExchangeProcessModelBuilder extends SimpleModelBuilder imp
 
 	}
 
+	public static XhtmlContent createXhtmlValue(String value) {
+		XhtmlContent xhtmlContent = ReqIF10Factory.eINSTANCE.createXhtmlContent();
+		XhtmlPType p = XhtmlFactory.eINSTANCE.createXhtmlPType();
+		setMixedText(p, value);
+		xhtmlContent.setP(p);
+		return xhtmlContent;
+	}
+
+	private static void setMixedText(EObject eObject, String value) {
+		// get the mixed attribute
+		EAttribute mixedAttribute = null;
+		for (EAttribute eAttribute : eObject.eClass().getEAllAttributes()) {
+			if ("mixed".equals(eAttribute.getName()) && EcorePackage.eINSTANCE.getEFeatureMapEntry() == eAttribute.getEAttributeType()) {
+				mixedAttribute = eAttribute;
+				break;
+			}
+		}
+		FeatureMap featureMap = (FeatureMap) eObject.eGet(mixedAttribute);
+		featureMap.add(FeatureMapUtil.createTextEntry(value));
+	}
+
 	@Override
 	public void createSpecObjects() throws Exception {
 		createBasicSpecObject(specObject01, "01", "no change", "no change", one);
diff --git a/org.eclipse.rmf.reqif10.tests/src/org/eclipse/rmf/reqif10/tests/uc003/tc18xx/TC1801HISExchangeProcessModelBuilder.java b/org.eclipse.rmf.reqif10.tests/src/org/eclipse/rmf/reqif10/tests/uc003/tc18xx/TC1801HISExchangeProcessModelBuilder.java
index b6095dfd..f4fd6bfa 100644
--- a/org.eclipse.rmf.reqif10.tests/src/org/eclipse/rmf/reqif10/tests/uc003/tc18xx/TC1801HISExchangeProcessModelBuilder.java
+++ b/org.eclipse.rmf.reqif10.tests/src/org/eclipse/rmf/reqif10/tests/uc003/tc18xx/TC1801HISExchangeProcessModelBuilder.java
@@ -7,8 +7,10 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
 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.ReqIF;
 import org.eclipse.rmf.reqif10.ReqIF10Factory;
 import org.eclipse.rmf.reqif10.SpecHierarchy;
@@ -49,6 +51,7 @@ public class TC1801HISExchangeProcessModelBuilder {
 	private void createSpecObject04() throws Exception {
 		SpecObjectType specObjectType = (SpecObjectType) reqIF.getCoreContent().getSpecTypes().get(0);
 		AttributeValueString attributeValueString;
+		AttributeValueXHTML attributeValueXhtml;
 		AttributeValueEnumeration attributeValueEnum;
 
 		SpecObject specObject = ReqIF10Factory.eINSTANCE.createSpecObject();
@@ -56,10 +59,10 @@ public class TC1801HISExchangeProcessModelBuilder {
 		specObject.setLastChange(toDate(LAST_CHANGE_STRING_1));
 		specObject.setType(specObjectType);
 
-		attributeValueString = ReqIF10Factory.eINSTANCE.createAttributeValueString();
-		attributeValueString.setDefinition((AttributeDefinitionString) specObjectType.getSpecAttributes().get(0));
-		attributeValueString.setTheValue("Obj-04");
-		specObject.getValues().add(attributeValueString);
+		attributeValueXhtml = ReqIF10Factory.eINSTANCE.createAttributeValueXHTML();
+		attributeValueXhtml.setDefinition((AttributeDefinitionXHTML) specObjectType.getSpecAttributes().get(0));
+		attributeValueXhtml.setTheValue(TC1800HISExchangeProcessModelBuilder.createXhtmlValue("Obj-04"));
+		specObject.getValues().add(attributeValueXhtml);
 
 		attributeValueString = ReqIF10Factory.eINSTANCE.createAttributeValueString();
 		attributeValueString.setDefinition((AttributeDefinitionString) specObjectType.getSpecAttributes().get(1));
diff --git a/org.eclipse.rmf.reqif10.tests/src/org/eclipse/rmf/reqif10/tests/uc003/tc18xx/TC1803HISExchangeProcessModelBuilder.java b/org.eclipse.rmf.reqif10.tests/src/org/eclipse/rmf/reqif10/tests/uc003/tc18xx/TC1803HISExchangeProcessModelBuilder.java
index a0bd2737..d08234e6 100644
--- a/org.eclipse.rmf.reqif10.tests/src/org/eclipse/rmf/reqif10/tests/uc003/tc18xx/TC1803HISExchangeProcessModelBuilder.java
+++ b/org.eclipse.rmf.reqif10.tests/src/org/eclipse/rmf/reqif10/tests/uc003/tc18xx/TC1803HISExchangeProcessModelBuilder.java
@@ -7,8 +7,10 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
 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.ReqIF;
 import org.eclipse.rmf.reqif10.ReqIF10Factory;
 import org.eclipse.rmf.reqif10.SpecHierarchy;
@@ -49,6 +51,7 @@ public class TC1803HISExchangeProcessModelBuilder {
 	private void createSpecObject05() throws Exception {
 		SpecObjectType specObjectType = (SpecObjectType) reqIF.getCoreContent().getSpecTypes().get(0);
 		AttributeValueString attributeValueString;
+		AttributeValueXHTML attributeValueXhtml;
 		AttributeValueEnumeration attributeValueEnum;
 
 		SpecObject specObject = ReqIF10Factory.eINSTANCE.createSpecObject();
@@ -56,10 +59,10 @@ public class TC1803HISExchangeProcessModelBuilder {
 		specObject.setLastChange(toDate(LAST_CHANGE_STRING_3));
 		specObject.setType(specObjectType);
 
-		attributeValueString = ReqIF10Factory.eINSTANCE.createAttributeValueString();
-		attributeValueString.setDefinition((AttributeDefinitionString) specObjectType.getSpecAttributes().get(0));
-		attributeValueString.setTheValue("Obj-05");
-		specObject.getValues().add(attributeValueString);
+		attributeValueXhtml = ReqIF10Factory.eINSTANCE.createAttributeValueXHTML();
+		attributeValueXhtml.setDefinition((AttributeDefinitionXHTML) specObjectType.getSpecAttributes().get(0));
+		attributeValueXhtml.setTheValue(TC1800HISExchangeProcessModelBuilder.createXhtmlValue("Obj-05"));
+		specObject.getValues().add(attributeValueXhtml);
 
 		attributeValueString = ReqIF10Factory.eINSTANCE.createAttributeValueString();
 		attributeValueString.setDefinition((AttributeDefinitionString) specObjectType.getSpecAttributes().get(1));
diff --git a/org.eclipse.rmf.reqif10.tests/src/org/eclipse/rmf/reqif10/tests/uc003/tc18xx/TC18xxHISExchangeProcessTests.java b/org.eclipse.rmf.reqif10.tests/src/org/eclipse/rmf/reqif10/tests/uc003/tc18xx/TC18xxHISExchangeProcessTests.java
index 160dd5c6..3167041d 100644
--- a/org.eclipse.rmf.reqif10.tests/src/org/eclipse/rmf/reqif10/tests/uc003/tc18xx/TC18xxHISExchangeProcessTests.java
+++ b/org.eclipse.rmf.reqif10.tests/src/org/eclipse/rmf/reqif10/tests/uc003/tc18xx/TC18xxHISExchangeProcessTests.java
@@ -16,15 +16,22 @@ import static junit.framework.Assert.assertNotNull;
 import static junit.framework.Assert.assertNull;
 import static junit.framework.Assert.assertTrue;
 
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.util.FeatureMap;
+import org.eclipse.emf.ecore.util.FeatureMap.Entry;
 import org.eclipse.rmf.reqif10.AttributeValueString;
+import org.eclipse.rmf.reqif10.AttributeValueXHTML;
 import org.eclipse.rmf.reqif10.ReqIF;
 import org.eclipse.rmf.reqif10.SpecHierarchy;
 import org.eclipse.rmf.reqif10.SpecObject;
 import org.eclipse.rmf.reqif10.Specification;
+import org.eclipse.rmf.reqif10.XhtmlContent;
 import org.eclipse.rmf.reqif10.common.util.ReqIF10Util;
 import org.eclipse.rmf.reqif10.tests.util.AbstractTestCase;
 import org.eclipse.rmf.reqif10.tests.util.CommonSystemAttributes;
+import org.eclipse.rmf.reqif10.xhtml.XhtmlPType;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -72,8 +79,21 @@ public class TC18xxHISExchangeProcessTests extends AbstractTestCase implements C
 	SpecObject getSpecObjectByName(ReqIF reqif, String name) {
 		SpecObject target = null;
 		for (SpecObject specObject : reqif.getCoreContent().getSpecObjects()) {
-			AttributeValueString value = (AttributeValueString) ReqIF10Util.getAttributeValueForLabel(specObject, REQIF_NAME);
-			if (name.equals(value.getTheValue())) {
+			AttributeValueXHTML value = (AttributeValueXHTML) ReqIF10Util.getAttributeValueForLabel(specObject, REQIF_NAME);
+			XhtmlContent content = value.getTheValue();
+			XhtmlPType p = content.getP();
+
+			EAttribute mixedAttribute = null;
+			for (EAttribute eAttribute : p.eClass().getEAllAttributes()) {
+				if ("mixed".equals(eAttribute.getName()) && EcorePackage.eINSTANCE.getEFeatureMapEntry() == eAttribute.getEAttributeType()) {
+					mixedAttribute = eAttribute;
+					break;
+				}
+			}
+			FeatureMap featureMap = (FeatureMap) p.eGet(mixedAttribute);
+			Entry entry = featureMap.get(0);
+
+			if (name.equals(entry.getValue())) {
 				if (target != null) {
 					throw new IllegalStateException("More than one element with name " + name);
 				}