tutorials

14 files changed, 180 insertions, 371 deletions

diff --git a/plugins/org.eclipse.emf.cdo.doc/html/connectors/CreatingTransportConnections.html b/plugins/org.eclipse.emf.cdo.doc/html/connectors/CreatingTransportConnections.html
index b48ff9c9d3..1904fd5e48 100644
--- a/plugins/org.eclipse.emf.cdo.doc/html/connectors/CreatingTransportConnections.html
+++ b/plugins/org.eclipse.emf.cdo.doc/html/connectors/CreatingTransportConnections.html
@@ -1,18 +1,57 @@
 <h1>Creating Transport Connections</h1>
-<a name="CreatingTransportConnections"/><b><i>UNRESOLVED</i></b><b><i>UNRESOLVED</i></b><b><i>UNRESOLVED</i></b><b><i>UNRESOLVED</i></b><b><i>UNRESOLVED</i></b>
+<a name="CreatingTransportConnections"/><p>
+ This tutorial outlines the steps needed to create a Net4j <b><i>UNRESOLVED</i></b><b><i>UNRESOLVED</i></b> and connect it to an <b><i>UNRESOLVED</i></b><b><i>UNRESOLVED</i></b>.
+ <p>
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam eu nibh in erat dapibus accumsan. Aenean cursus
+ lacinia dictum. Mauris non sem sapien. Vivamus sem ante, posuere a rhoncus ac, varius in nisi. Sed pulvinar urna ac
+ est iaculis mattis. Ut eget massa felis, nec volutpat purus. In id aliquet mi. Duis euismod sapien sollicitudin nisi
+ vestibulum nec vulputate urna euismod. Proin pulvinar ornare nunc, ac auctor elit placerat eget. Integer eu erat ac
+ risus ultricies mattis vel nec nunc. Proin venenatis tellus sit amet dui congue nec vehicula urna sollicitudin. Donec
+ porta, risus eu auctor semper, ante lectus lobortis sem, a luctus diam dui eu sapien. Sed at metus et dolor tincidunt
+ convallis id a est. Donec quam nisl, scelerisque a feugiat id, mattis vel urna. Suspendisse facilisis, libero ac
+ ultricies dictum, mi sem feugiat purus, ac aliquam metus purus sed leo. Sed a viverra metus.<b><i>UNRESOLVED</i></b>
 
 <h1>Select a Transport Type</h1>
-<a name="CreatingTransportConnections.SelectTransportType"/><b><i>UNRESOLVED</i></b><b><i>UNRESOLVED</i></b><b><i>UNRESOLVED</i></b><b><i>UNRESOLVED</i></b><b><i>UNRESOLVED</i></b><b><i>UNRESOLVED</i></b><b><i>UNRESOLVED</i></b><b><i>UNRESOLVED</i></b><b><i>UNRESOLVED</i></b><b><i>UNRESOLVED</i></b><b><i>UNRESOLVED</i></b>
+<a name="CreatingTransportConnections.SelectTransportType"/><p>
+ Currently supported transport types are:
+ <ul>
+ <li><b>JVM</b> to connect to an <b><i>UNRESOLVED</i></b><b><i>UNRESOLVED</i></b> in the same Java Virtual Machine.
+ <li><b>TCP</b> to connect to an <b><i>UNRESOLVED</i></b><b><i>UNRESOLVED</i></b> by means of a <b><i>UNRESOLVED</i></b><b><i>UNRESOLVED</i></b>.
+ <li><b>SSL</b> an extension to the TCP transport that adds TLS/SSL security.
+ <li><b>HTTP</b> to connect to an <b><i>UNRESOLVED</i></b><b><i>UNRESOLVED</i></b> that is made available by a servlet.
+ </ul>
+ Continue with <b><i>UNRESOLVED</i></b><b><i>UNRESOLVED</i></b>.<b><i>UNRESOLVED</i></b>
 
 <h1>Setup a Wiring Container</h1>
-<a name="CreatingTransportConnections.SetupWiringContainer"/><b><i>UNRESOLVED</i></b><b><i>UNRESOLVED</i></b><b><i>UNRESOLVED</i></b>
+<a name="CreatingTransportConnections.SetupWiringContainer"/><p>
+ Ut eget massa felis, nec volutpat purus. In id aliquet mi. Duis euismod sapien sollicitudin nisi vestibulum nec
+ vulputate urna euismod. Proin pulvinar ornare nunc, ac auctor elit placerat eget. Integer eu erat ac risus
+ ultricies mattis vel nec nunc. <b><i>UNRESOLVED</i></b><b><i>UNRESOLVED</i></b> Lorem ipsum dolor sit amet,
+ consectetur adipiscing elit. Etiam eu nibh in erat dapibus accumsan. Aenean cursus lacinia dictum. Mauris non sem
+ sapien. Vivamus sem ante, posuere a rhoncus ac, varius in nisi. Sed pulvinar urna ac est iaculis mattis. Ut eget
+ massa felis, nec volutpat purus. In id aliquet mi. Duis euismod sapien sollicitudin nisi vestibulum nec vulputate
+ urna euismod. Proin pulvinar ornare nunc, ac auctor elit placerat eget. Integer eu erat ac risus ultricies mattis
+ vel nec nunc. Proin venenatis tellus sit amet dui congue nec vehicula urna sollicitudin. Donec porta, risus eu
+ auctor semper, ante lectus lobortis sem, a luctus diam dui eu sapien. Sed at metus et dolor tincidunt convallis id
+ a est. Donec quam nisl, scelerisque a feugiat id, mattis vel urna. Suspendisse facilisis, libero ac ultricies
+ dictum, mi sem feugiat purus, ac aliquam metus purus sed leo. Sed a viverra metus.<b><i>UNRESOLVED</i></b>
 
 <h1>Add Configuration Parameters</h1>
 <a name="CreatingTransportConnections.AddConfigurationParameters"/>
 
 <h1>Set the Buffer Capacity</h1>
-<a name="CreatingTransportConnections.AddConfigurationParameters.SetBufferCapacity"/><b><i>UNRESOLVED</i></b><b><i>UNRESOLVED</i></b>
+<a name="CreatingTransportConnections.AddConfigurationParameters.SetBufferCapacity"/><p>
+ <b><i>UNRESOLVED</i></b><b><i>UNRESOLVED</i></b>
 
 <h1>Set the Connection Timeout</h1>
-<a name="CreatingTransportConnections.AddConfigurationParameters.SetConnectionTimeout"/><b><i>UNRESOLVED</i></b>
+<a name="CreatingTransportConnections.AddConfigurationParameters.SetConnectionTimeout"/><p>
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam eu nibh in erat dapibus accumsan. Aenean cursus
+ lacinia dictum. Mauris non sem sapien. Vivamus sem ante, posuere a rhoncus ac, varius in nisi. Sed pulvinar urna
+ ac est iaculis mattis. Ut eget massa felis, nec volutpat purus. In id aliquet mi. Duis euismod sapien
+ sollicitudin nisi vestibulum nec vulputate urna euismod. Proin pulvinar ornare nunc, ac auctor elit placerat
+ eget. Integer eu erat ac risus ultricies mattis vel nec nunc. Proin venenatis tellus sit amet dui congue nec
+ vehicula urna sollicitudin. Donec porta, risus eu auctor semper, ante lectus lobortis sem, a luctus diam dui eu
+ sapien. Sed at metus et dolor tincidunt convallis id a est. Donec quam nisl, scelerisque a feugiat id, mattis vel
+ urna. Suspendisse facilisis, libero ac ultricies dictum, mi sem feugiat purus, ac aliquam metus purus sed leo.
+ Sed a viverra metus.<b><i>UNRESOLVED</i></b>
 
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecore b/plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecore
index fe0d13e859..380bea1122 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecore
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecore
@@ -38,10 +38,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="callouts" upperBound="-1"

         eType="#//Callout" containment="true" resolveProxies="false" eOpposite="#//Callout/snippet"/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Diagram" eSuperTypes="#//BodyElement">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="code" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"

-        changeable="false"/>

-  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Diagram" eSuperTypes="#//BodyElement"/>

   <eClassifiers xsi:type="ecore:EClass" name="Factory" eSuperTypes="#//EmbeddableElement"/>

   <eClassifiers xsi:type="ecore:EClass" name="JavaElement" eSuperTypes="#//LinkTarget"/>

   <eClassifiers xsi:type="ecore:EClass" name="StructuralElement" abstract="true" eSuperTypes="#//LinkTarget">

@@ -108,10 +105,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="callout" eType="#//Callout"

         resolveProxies="false" eOpposite="#//Callout/elements"/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Text" eSuperTypes="#//BodyElement">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"

-        changeable="false"/>

-  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Text" eSuperTypes="#//BodyElement"/>

   <eClassifiers xsi:type="ecore:EClass" name="Link" eSuperTypes="#//BodyElement">

     <eStructuralFeatures xsi:type="ecore:EReference" name="target" eType="#//LinkTarget"

         resolveProxies="false"/>

diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecorediag b/plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecorediag
index af51b9b7d5..8b1363ad81 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecorediag
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecorediag
@@ -115,10 +115,6 @@
   <children xmi:type="notation:Node" xmi:id="_Bj9lYNxPEeCpIJpgvmzkYA" type="1001">

     <children xmi:type="notation:Node" xmi:id="_Bj9lY9xPEeCpIJpgvmzkYA" type="4001"/>

     <children xmi:type="notation:Node" xmi:id="_Bj-McNxPEeCpIJpgvmzkYA" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_GitO8NxdEeCpIJpgvmzkYA" type="2001">

-        <element xmi:type="ecore:EAttribute" href="article.ecore#//Diagram/code"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Git2ANxdEeCpIJpgvmzkYA"/>

-      </children>

       <styles xmi:type="notation:DrawerStyle" xmi:id="_Bj-McdxPEeCpIJpgvmzkYA"/>

       <styles xmi:type="notation:SortingStyle" xmi:id="_Bj-MctxPEeCpIJpgvmzkYA"/>

       <styles xmi:type="notation:FilteringStyle" xmi:id="_Bj-Mc9xPEeCpIJpgvmzkYA"/>

@@ -327,10 +323,6 @@
   <children xmi:type="notation:Node" xmi:id="_hvZKENxaEeCpIJpgvmzkYA" type="1001">

     <children xmi:type="notation:Node" xmi:id="_hvZxINxaEeCpIJpgvmzkYA" type="4001"/>

     <children xmi:type="notation:Node" xmi:id="_hvaYMNxaEeCpIJpgvmzkYA" type="5001">

-      <children xmi:type="notation:Node" xmi:id="__bJL0NxbEeCpIJpgvmzkYA" type="2001">

-        <element xmi:type="ecore:EAttribute" href="article.ecore#//Text/value"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="__bJy4NxbEeCpIJpgvmzkYA"/>

-      </children>

       <styles xmi:type="notation:DrawerStyle" xmi:id="_hvaYMdxaEeCpIJpgvmzkYA"/>

       <styles xmi:type="notation:SortingStyle" xmi:id="_hvaYMtxaEeCpIJpgvmzkYA"/>

       <styles xmi:type="notation:FilteringStyle" xmi:id="_hvaYM9xaEeCpIJpgvmzkYA"/>

@@ -611,19 +603,19 @@
     <styles xmi:type="notation:ConnectorStyle" xmi:id="_pSB1EdxaEeCpIJpgvmzkYA" routing="Rectilinear" lineColor="4210752"/>

     <styles xmi:type="notation:FontStyle" xmi:id="_pSB1EtxaEeCpIJpgvmzkYA" fontName="Segoe UI"/>

     <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pSB1E9xaEeCpIJpgvmzkYA" points="[-3, -24, -182, 84]$[-3, -49, -182, 59]$[178, -49, -1, 59]$[178, -87, -1, 21]"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pSB1E9xaEeCpIJpgvmzkYA" points="[-1, -20, -188, 80]$[-1, -47, -188, 53]$[183, -47, -4, 53]$[183, -75, -4, 25]"/>

   </edges>

   <edges xmi:type="notation:Edge" xmi:id="_p1VWcNxaEeCpIJpgvmzkYA" type="3003" source="_Bj9lYNxPEeCpIJpgvmzkYA" target="_yWi_ANxZEeCpIJpgvmzkYA">

     <styles xmi:type="notation:ConnectorStyle" xmi:id="_p1VWcdxaEeCpIJpgvmzkYA" routing="Rectilinear" lineColor="4210752"/>

     <styles xmi:type="notation:FontStyle" xmi:id="_p1VWctxaEeCpIJpgvmzkYA" fontName="Segoe UI"/>

     <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_p1VWc9xaEeCpIJpgvmzkYA" points="[-4, -24, 187, 84]$[-4, -49, 187, 59]$[-192, -49, -1, 59]$[-192, -87, -1, 21]"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_p1VWc9xaEeCpIJpgvmzkYA" points="[-2, -20, 181, 80]$[-2, -47, 181, 53]$[-187, -47, -4, 53]$[-187, -75, -4, 25]"/>

   </edges>

   <edges xmi:type="notation:Edge" xmi:id="_6-blYNxaEeCpIJpgvmzkYA" type="3003" source="_5fxPANxaEeCpIJpgvmzkYA" target="_yWi_ANxZEeCpIJpgvmzkYA">

     <styles xmi:type="notation:ConnectorStyle" xmi:id="_6-blYdxaEeCpIJpgvmzkYA" routing="Rectilinear" lineColor="4210752"/>

     <styles xmi:type="notation:FontStyle" xmi:id="_6-blYtxaEeCpIJpgvmzkYA" fontName="Segoe UI"/>

     <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6-blY9xaEeCpIJpgvmzkYA" points="[-3, -20, 63, 84]$[-3, -45, 63, 59]$[-67, -45, -1, 59]$[-67, -83, -1, 21]"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6-blY9xaEeCpIJpgvmzkYA" points="[-2, -20, 61, 80]$[-2, -47, 61, 53]$[-65, -47, -2, 53]$[-65, -75, -2, 25]"/>

   </edges>

   <edges xmi:type="notation:Edge" xmi:id="_MrPI4NxcEeCpIJpgvmzkYA" type="3002" source="_-69sYNxaEeCpIJpgvmzkYA" target="_bhQRANxTEeCpIJpgvmzkYA">

     <children xmi:type="notation:Node" xmi:id="_MrPI5NxcEeCpIJpgvmzkYA" type="4011">

@@ -641,7 +633,7 @@
     <styles xmi:type="notation:ConnectorStyle" xmi:id="_UGQI8dxcEeCpIJpgvmzkYA" routing="Rectilinear" lineColor="4210752"/>

     <styles xmi:type="notation:FontStyle" xmi:id="_UGQI8txcEeCpIJpgvmzkYA" fontName="Segoe UI"/>

     <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UGQI89xcEeCpIJpgvmzkYA" points="[1, -20, -57, 84]$[1, -45, -57, 59]$[57, -45, -1, 59]$[57, -83, -1, 21]"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UGQI89xcEeCpIJpgvmzkYA" points="[2, -20, -59, 80]$[2, -47, -59, 53]$[59, -47, -2, 53]$[59, -75, -2, 25]"/>

   </edges>

   <edges xmi:type="notation:Edge" xmi:id="_VIxV4NxcEeCpIJpgvmzkYA" type="3002" source="_5fxPANxaEeCpIJpgvmzkYA" target="_x5KOgNxQEeCpIJpgvmzkYA">

     <children xmi:type="notation:Node" xmi:id="_VIx88NxcEeCpIJpgvmzkYA" type="4011">

diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ArticlePackage.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ArticlePackage.java
index 65a612e9bd..b7fe2f6f15 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ArticlePackage.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ArticlePackage.java
@@ -1072,20 +1072,12 @@ public interface ArticlePackage extends EPackage
   int DIAGRAM__CALLOUT = BODY_ELEMENT__CALLOUT;
 
   /**
-   * The feature id for the '<em><b>Code</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int DIAGRAM__CODE = BODY_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
    * The number of structural features of the '<em>Diagram</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
    * @generated
    * @ordered
    */
-  int DIAGRAM_FEATURE_COUNT = BODY_ELEMENT_FEATURE_COUNT + 1;
+  int DIAGRAM_FEATURE_COUNT = BODY_ELEMENT_FEATURE_COUNT + 0;
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.FactoryImpl <em>Factory</em>}'
@@ -1262,20 +1254,12 @@ public interface ArticlePackage extends EPackage
   int TEXT__CALLOUT = BODY_ELEMENT__CALLOUT;
 
   /**
-   * The feature id for the '<em><b>Value</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int TEXT__VALUE = BODY_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
    * The number of structural features of the '<em>Text</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
    * @generated
    * @ordered
    */
-  int TEXT_FEATURE_COUNT = BODY_ELEMENT_FEATURE_COUNT + 1;
+  int TEXT_FEATURE_COUNT = BODY_ELEMENT_FEATURE_COUNT + 0;
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.LinkImpl <em>Link</em>}' class. <!--
@@ -1625,17 +1609,6 @@ public interface ArticlePackage extends EPackage
   EClass getDiagram();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.doc.article.Diagram#getCode
-   * <em>Code</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the attribute '<em>Code</em>'.
-   * @see org.eclipse.emf.cdo.releng.doc.article.Diagram#getCode()
-   * @see #getDiagram()
-   * @generated
-   */
-  EAttribute getDiagram_Code();
-
-  /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.Factory <em>Factory</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
    * 
@@ -1967,17 +1940,6 @@ public interface ArticlePackage extends EPackage
   EClass getText();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.doc.article.Text#getValue
-   * <em>Value</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the attribute '<em>Value</em>'.
-   * @see org.eclipse.emf.cdo.releng.doc.article.Text#getValue()
-   * @see #getText()
-   * @generated
-   */
-  EAttribute getText_Value();
-
-  /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.Link <em>Link</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
    * 
@@ -2235,14 +2197,6 @@ public interface ArticlePackage extends EPackage
     EClass DIAGRAM = eINSTANCE.getDiagram();
 
     /**
-     * The meta object literal for the '<em><b>Code</b></em>' attribute feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EAttribute DIAGRAM__CODE = eINSTANCE.getDiagram_Code();
-
-    /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.FactoryImpl <em>Factory</em>}
      * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
@@ -2505,14 +2459,6 @@ public interface ArticlePackage extends EPackage
     EClass TEXT = eINSTANCE.getText();
 
     /**
-     * The meta object literal for the '<em><b>Value</b></em>' attribute feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EAttribute TEXT__VALUE = eINSTANCE.getText_Value();
-
-    /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.LinkImpl <em>Link</em>}'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Diagram.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Diagram.java
index 7c56bc7b50..f5c58bcc90 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Diagram.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Diagram.java
@@ -8,12 +8,6 @@ package org.eclipse.emf.cdo.releng.doc.article;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Diagram</b></em>'. <!-- end-user-doc -->
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.cdo.releng.doc.article.Diagram#getCode <em>Code</em>}</li>
- * </ul>
- * </p>
  * 
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getDiagram()
  * @model
@@ -21,18 +15,5 @@ package org.eclipse.emf.cdo.releng.doc.article;
  */
 public interface Diagram extends BodyElement
 {
-  /**
-   * Returns the value of the '<em><b>Code</b></em>' attribute. <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Code</em>' attribute isn't clear, there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * 
-   * @return the value of the '<em>Code</em>' attribute.
-   * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getDiagram_Code()
-   * @model required="true" changeable="false"
-   * @generated
-   */
-  String getCode();
 
 } // Diagram
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Text.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Text.java
index 6b3caf7870..4311194d3e 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Text.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Text.java
@@ -8,12 +8,6 @@ package org.eclipse.emf.cdo.releng.doc.article;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Text</b></em>'. <!-- end-user-doc -->
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.cdo.releng.doc.article.Text#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
  * 
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getText()
  * @model
@@ -21,18 +15,5 @@ package org.eclipse.emf.cdo.releng.doc.article;
  */
 public interface Text extends BodyElement
 {
-  /**
-   * 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...
-   * </p>
-   * <!-- end-user-doc -->
-   * 
-   * @return the value of the '<em>Value</em>' attribute.
-   * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getText_Value()
-   * @model required="true" changeable="false"
-   * @generated
-   */
-  String getValue();
 
 } // Text
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticlePackageImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticlePackageImpl.java
index 5add56257a..d2df8183d2 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticlePackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticlePackageImpl.java
@@ -455,16 +455,6 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
    * 
    * @generated
    */
-  public EAttribute getDiagram_Code()
-  {
-    return (EAttribute)diagramEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
   public EClass getFactory()
   {
     return factoryEClass;
@@ -765,16 +755,6 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
    * 
    * @generated
    */
-  public EAttribute getText_Value()
-  {
-    return (EAttribute)textEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
   public EClass getLink()
   {
     return linkEClass;
@@ -903,7 +883,6 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
     createEReference(snippetEClass, SNIPPET__CALLOUTS);
 
     diagramEClass = createEClass(DIAGRAM);
-    createEAttribute(diagramEClass, DIAGRAM__CODE);
 
     factoryEClass = createEClass(FACTORY);
 
@@ -945,7 +924,6 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
     createEReference(bodyElementEClass, BODY_ELEMENT__CALLOUT);
 
     textEClass = createEClass(TEXT);
-    createEAttribute(textEClass, TEXT__VALUE);
 
     linkEClass = createEClass(LINK);
     createEReference(linkEClass, LINK__TARGET);
@@ -1050,8 +1028,6 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(diagramEClass, Diagram.class, "Diagram", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getDiagram_Code(), ecorePackage.getEString(), "code", null, 1, 1, Diagram.class, !IS_TRANSIENT,
-        !IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(factoryEClass, Factory.class, "Factory", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
@@ -1139,8 +1115,6 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(textEClass, Text.class, "Text", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getText_Value(), ecorePackage.getEString(), "value", null, 1, 1, Text.class, !IS_TRANSIENT,
-        !IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(linkEClass, Link.class, "Link", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEReference(getLink_Target(), this.getLinkTarget(), null, "target", null, 0, 1, Link.class, !IS_TRANSIENT,
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/BodyElementImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/BodyElementImpl.java
index 37edd58152..4f6894ce34 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/BodyElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/BodyElementImpl.java
@@ -65,6 +65,11 @@ public abstract class BodyElementImpl extends EObjectImpl implements BodyElement
     this.tag = tag;
   }
 
+  public Tag getTag()
+  {
+    return tag;
+  }
+
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
@@ -84,7 +89,9 @@ public abstract class BodyElementImpl extends EObjectImpl implements BodyElement
   public Body getBody()
   {
     if (eContainerFeatureID() != ArticlePackage.BODY_ELEMENT__BODY)
+    {
       return null;
+    }
     return (Body)eContainer();
   }
 
@@ -106,22 +113,32 @@ public abstract class BodyElementImpl extends EObjectImpl implements BodyElement
    */
   public void setBody(Body newBody)
   {
-    if (newBody != eInternalContainer()
-        || (eContainerFeatureID() != ArticlePackage.BODY_ELEMENT__BODY && newBody != null))
+    if (newBody != eInternalContainer() || eContainerFeatureID() != ArticlePackage.BODY_ELEMENT__BODY
+        && newBody != null)
     {
       if (EcoreUtil.isAncestor(this, newBody))
+      {
         throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+      }
       NotificationChain msgs = null;
       if (eInternalContainer() != null)
+      {
         msgs = eBasicRemoveFromContainer(msgs);
+      }
       if (newBody != null)
+      {
         msgs = ((InternalEObject)newBody).eInverseAdd(this, ArticlePackage.BODY__ELEMENTS, Body.class, msgs);
+      }
       msgs = basicSetBody(newBody, msgs);
       if (msgs != null)
+      {
         msgs.dispatch();
+      }
     }
     else if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, ArticlePackage.BODY_ELEMENT__BODY, newBody, newBody));
+    }
   }
 
   /**
@@ -139,7 +156,9 @@ public abstract class BodyElementImpl extends EObjectImpl implements BodyElement
   public Callout getCallout()
   {
     if (eContainerFeatureID() != ArticlePackage.BODY_ELEMENT__CALLOUT)
+    {
       return null;
+    }
     return (Callout)eContainer();
   }
 
@@ -161,23 +180,33 @@ public abstract class BodyElementImpl extends EObjectImpl implements BodyElement
    */
   public void setCallout(Callout newCallout)
   {
-    if (newCallout != eInternalContainer()
-        || (eContainerFeatureID() != ArticlePackage.BODY_ELEMENT__CALLOUT && newCallout != null))
+    if (newCallout != eInternalContainer() || eContainerFeatureID() != ArticlePackage.BODY_ELEMENT__CALLOUT
+        && newCallout != null)
     {
       if (EcoreUtil.isAncestor(this, newCallout))
+      {
         throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+      }
       NotificationChain msgs = null;
       if (eInternalContainer() != null)
+      {
         msgs = eBasicRemoveFromContainer(msgs);
+      }
       if (newCallout != null)
+      {
         msgs = ((InternalEObject)newCallout).eInverseAdd(this, ArticlePackage.CALLOUT__ELEMENTS, Callout.class, msgs);
+      }
       msgs = basicSetCallout(newCallout, msgs);
       if (msgs != null)
+      {
         msgs.dispatch();
+      }
     }
     else if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, ArticlePackage.BODY_ELEMENT__CALLOUT, newCallout,
           newCallout));
+    }
   }
 
   /**
@@ -192,11 +221,15 @@ public abstract class BodyElementImpl extends EObjectImpl implements BodyElement
     {
     case ArticlePackage.BODY_ELEMENT__BODY:
       if (eInternalContainer() != null)
+      {
         msgs = eBasicRemoveFromContainer(msgs);
+      }
       return basicSetBody((Body)otherEnd, msgs);
     case ArticlePackage.BODY_ELEMENT__CALLOUT:
       if (eInternalContainer() != null)
+      {
         msgs = eBasicRemoveFromContainer(msgs);
+      }
       return basicSetCallout((Callout)otherEnd, msgs);
     }
     return super.eInverseAdd(otherEnd, featureID, msgs);
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/BodyImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/BodyImpl.java
index eb3272d289..a4373463e2 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/BodyImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/BodyImpl.java
@@ -12,6 +12,7 @@ import org.eclipse.emf.cdo.releng.doc.article.BodyElement;
 import org.eclipse.emf.cdo.releng.doc.article.Category;
 import org.eclipse.emf.cdo.releng.doc.article.StructuralElement;
 import org.eclipse.emf.cdo.releng.doc.article.util.ArticleUtil;
+import org.eclipse.emf.cdo.releng.doc.article.util.HtmlWriter;
 
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.common.util.EList;
@@ -23,6 +24,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
 import com.sun.javadoc.Doc;
 import com.sun.javadoc.Tag;
 
+import java.io.IOException;
 import java.util.Collection;
 
 /**
@@ -102,7 +104,7 @@ public abstract class BodyImpl extends StructuralElementImpl implements Body
       if (blockPos != -1)
       {
         String rest = text.substring(blockPos);
-        addElement(firstTag, rest);
+        addElement(new TextTag(firstTag, rest));
 
         text = text.substring(0, blockPos);
       }
@@ -117,14 +119,20 @@ public abstract class BodyImpl extends StructuralElementImpl implements Body
 
     for (int i = bodyStart; i < tags.length; i++)
     {
-      Tag tag = tags[i];
-      addElement(tag, tag.text());
+      addElement(tags[i]);
     }
   }
 
-  private void addElement(Tag tag, String text)
+  private void addElement(Tag tag)
   {
-    getElements().add(new UnresolvedBodyElementImpl(this, tag, text));
+    if (tag.kind().equals("Text"))
+    {
+      getElements().add(new TextImpl(this, tag));
+    }
+    else
+    {
+      getElements().add(new UnresolvedBodyElement(this, tag));
+    }
   }
 
   private void titleMissing()
@@ -326,7 +334,9 @@ public abstract class BodyImpl extends StructuralElementImpl implements Body
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (html: ");
@@ -341,4 +351,18 @@ public abstract class BodyImpl extends StructuralElementImpl implements Body
     return getDoc();
   }
 
+  @Override
+  public void generate(HtmlWriter out) throws IOException
+  {
+    EList<BodyElement> elements = getElements();
+    UnresolvedBodyElement.resolve(getDocumentation().getContext(), elements);
+
+    for (BodyElement element : elements)
+    {
+      out.write(element.getHtml());
+    }
+
+    out.write("\n\n");
+    super.generate(out);
+  }
 } // BodyImpl
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ChapterImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ChapterImpl.java
index 54cbe80f73..778caf8136 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ChapterImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ChapterImpl.java
@@ -8,7 +8,6 @@ package org.eclipse.emf.cdo.releng.doc.article.impl;
 
 import org.eclipse.emf.cdo.releng.doc.article.Article;
 import org.eclipse.emf.cdo.releng.doc.article.ArticlePackage;
-import org.eclipse.emf.cdo.releng.doc.article.BodyElement;
 import org.eclipse.emf.cdo.releng.doc.article.Chapter;
 import org.eclipse.emf.cdo.releng.doc.article.StructuralElement;
 import org.eclipse.emf.cdo.releng.doc.article.util.HtmlWriter;
@@ -123,12 +122,6 @@ public class ChapterImpl extends BodyImpl implements Chapter
     out.write(classDoc.typeName());
     out.write("\"/>");
 
-    for (BodyElement element : getElements())
-    {
-      out.write(element.getHtml());
-    }
-
-    out.write("\n\n");
     super.generate(out);
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DiagramImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DiagramImpl.java
index 24f7fc5ac3..2f72855f10 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DiagramImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DiagramImpl.java
@@ -14,10 +14,6 @@ import org.eclipse.emf.ecore.EClass;
 /**
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>Diagram</b></em>'. <!-- end-user-doc -->
  * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.cdo.releng.doc.article.impl.DiagramImpl#getCode <em>Code</em>}</li>
- * </ul>
  * </p>
  * 
  * @generated
@@ -25,25 +21,6 @@ import org.eclipse.emf.ecore.EClass;
 public class DiagramImpl extends BodyElementImpl implements Diagram
 {
   /**
-   * The default value of the '{@link #getCode() <em>Code</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   * 
-   * @see #getCode()
-   * @generated
-   * @ordered
-   */
-  protected static final String CODE_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getCode() <em>Code</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see #getCode()
-   * @generated
-   * @ordered
-   */
-  protected String code = CODE_EDEFAULT;
-
-  /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
    * @generated
@@ -64,66 +41,6 @@ public class DiagramImpl extends BodyElementImpl implements Diagram
     return ArticlePackage.Literals.DIAGRAM;
   }
 
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public String getCode()
-  {
-    return code;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-    case ArticlePackage.DIAGRAM__CODE:
-      return getCode();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-    case ArticlePackage.DIAGRAM__CODE:
-      return CODE_EDEFAULT == null ? code != null : !CODE_EDEFAULT.equals(code);
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy())
-      return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (code: ");
-    result.append(code);
-    result.append(')');
-    return result.toString();
-  }
-
   @Override
   public String getHtml()
   {
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/TextImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/TextImpl.java
index a2e6824bb3..ac9de801fa 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/TextImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/TextImpl.java
@@ -17,10 +17,6 @@ import com.sun.javadoc.Tag;
 /**
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>Text</b></em>'. <!-- end-user-doc -->
  * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.cdo.releng.doc.article.impl.TextImpl#getValue <em>Value</em>}</li>
- * </ul>
  * </p>
  * 
  * @generated
@@ -28,26 +24,6 @@ import com.sun.javadoc.Tag;
 public class TextImpl extends BodyElementImpl implements Text
 {
   /**
-   * The default value of the '{@link #getValue() <em>Value</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   * 
-   * @see #getValue()
-   * @generated
-   * @ordered
-   */
-  protected static final String VALUE_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getValue() <em>Value</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   * 
-   * @see #getValue()
-   * @generated
-   * @ordered
-   */
-  protected String value = VALUE_EDEFAULT;
-
-  /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
    * @generated
@@ -57,10 +33,9 @@ public class TextImpl extends BodyElementImpl implements Text
     super();
   }
 
-  TextImpl(Body body, Tag tag, String value)
+  TextImpl(Body body, Tag tag)
   {
     super(body, tag);
-    this.value = value;
   }
 
   /**
@@ -74,70 +49,10 @@ public class TextImpl extends BodyElementImpl implements Text
     return ArticlePackage.Literals.TEXT;
   }
 
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public String getValue()
-  {
-    return value;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-    case ArticlePackage.TEXT__VALUE:
-      return getValue();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-    case ArticlePackage.TEXT__VALUE:
-      return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy())
-      return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (value: ");
-    result.append(value);
-    result.append(')');
-    return result.toString();
-  }
-
   @Override
   public String getHtml()
   {
-    return getValue();
+    return getTag().text();
   }
 
 } // TextImpl
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/UnresolvedBodyElement.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/UnresolvedBodyElement.java
new file mode 100644
index 0000000000..b56f1bda49
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/UnresolvedBodyElement.java
@@ -0,0 +1,60 @@
+/**
+ * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and 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:
+ *    Eike Stepper - initial API and implementation
+ */
+package org.eclipse.emf.cdo.releng.doc.article.impl;
+
+import org.eclipse.emf.cdo.releng.doc.article.Body;
+import org.eclipse.emf.cdo.releng.doc.article.BodyElement;
+import org.eclipse.emf.cdo.releng.doc.article.Context;
+
+import org.eclipse.emf.common.util.EList;
+
+import com.sun.javadoc.Tag;
+
+/**
+ * @author Eike Stepper
+ */
+public class UnresolvedBodyElement extends BodyElementImpl
+{
+  UnresolvedBodyElement(Body body, Tag tag)
+  {
+    super(body, tag);
+  }
+
+  public final String getText()
+  {
+    return "<b><i>UNRESOLVED</i></b>";
+  }
+
+  @Override
+  public String getHtml()
+  {
+    return getText();
+  }
+
+  public BodyElement resolve(Context context)
+  {
+    return null;
+  }
+
+  public static void resolve(Context context, EList<BodyElement> elements)
+  {
+    for (int i = 0; i < elements.size(); i++)
+    {
+      BodyElement element = elements.get(i);
+      if (element instanceof UnresolvedBodyElement)
+      {
+        UnresolvedBodyElement unresolved = (UnresolvedBodyElement)element;
+        BodyElement resolved = unresolved.resolve(context);
+        elements.set(i, resolved);
+      }
+    }
+  }
+}
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/UnresolvedBodyElementImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/UnresolvedBodyElementImpl.java
deleted file mode 100644
index f9f71fa4c7..0000000000
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/UnresolvedBodyElementImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and 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:
- *    Eike Stepper - initial API and implementation
- */
-package org.eclipse.emf.cdo.releng.doc.article.impl;
-
-import org.eclipse.emf.cdo.releng.doc.article.Body;
-
-import com.sun.javadoc.Tag;
-
-/**
- * @author Eike Stepper
- */
-public class UnresolvedBodyElementImpl extends BodyElementImpl
-{
-  private final String text;
-
-  UnresolvedBodyElementImpl(Body body, Tag tag, String text)
-  {
-    super(body, tag);
-    this.text = text;
-  }
-
-  public final String getText()
-  {
-    return text;
-  }
-
-  @Override
-  public String getHtml()
-  {
-    return "<b><i>UNRESOLVED</i></b>";
-  }
-}