[451350] Fix regression in generated Javadoc for implementation class
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/templates/model/Class.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/templates/model/Class.java
index 8286a79..b9e37b6 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/templates/model/Class.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/templates/model/Class.java
@@ -47,7 +47,7 @@
   protected final String TEXT_29 = NL + " * @extends ";
   protected final String TEXT_30 = NL + " * @generated" + NL + " */";
   protected final String TEXT_31 = NL + "/**" + NL + " * <!-- begin-user-doc -->" + NL + " * An implementation of the model object '<em><b>";
-  protected final String TEXT_32 = "</b></em>'." + NL + " * <!-- end-user-doc -->" + NL + " * <p>";
+  protected final String TEXT_32 = "</b></em>'." + NL + " * <!-- end-user-doc -->";
   protected final String TEXT_33 = NL + " * <p>" + NL + " * The following features are implemented:" + NL + " * </p>" + NL + " * <ul>";
   protected final String TEXT_34 = NL + " *   <li>{@link ";
   protected final String TEXT_35 = "#";
diff --git a/plugins/org.eclipse.emf.codegen.ecore/templates/model/Class.javajet b/plugins/org.eclipse.emf.codegen.ecore/templates/model/Class.javajet
index 07ff5c9..a4fcac3 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/templates/model/Class.javajet
+++ b/plugins/org.eclipse.emf.codegen.ecore/templates/model/Class.javajet
@@ -79,7 +79,6 @@
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b><%=genClass.getFormattedName()%></b></em>'.
  * <!-- end-user-doc -->
- * <p>
 <%if (!genClass.getImplementedGenFeatures().isEmpty()) {%>
  * <p>
  * The following features are implemented:
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.ecore/src/org/examples/library/impl/BookImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.ecore/src/org/examples/library/impl/BookImpl.java
index ed1020e..29643dd 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.ecore/src/org/examples/library/impl/BookImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.ecore/src/org/examples/library/impl/BookImpl.java
@@ -22,7 +22,6 @@
  * An implementation of the model object '<em><b>Book</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.ecore/src/org/examples/library/impl/LibraryImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.ecore/src/org/examples/library/impl/LibraryImpl.java
index ccfc031..18c3d32 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.ecore/src/org/examples/library/impl/LibraryImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.ecore/src/org/examples/library/impl/LibraryImpl.java
@@ -29,7 +29,6 @@
  * An implementation of the model object '<em><b>Library</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.ecore/src/org/examples/library/impl/WriterImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.ecore/src/org/examples/library/impl/WriterImpl.java
index 21ab116..037be87 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.ecore/src/org/examples/library/impl/WriterImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.ecore/src/org/examples/library/impl/WriterImpl.java
@@ -28,7 +28,6 @@
  * An implementation of the model object '<em><b>Writer</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.java/src/org/eclipse/example/library/impl/BookImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.java/src/org/eclipse/example/library/impl/BookImpl.java
index f24d741..9edd3ad 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.java/src/org/eclipse/example/library/impl/BookImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.java/src/org/eclipse/example/library/impl/BookImpl.java
@@ -22,7 +22,6 @@
  * An implementation of the model object '<em><b>Book</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.java/src/org/eclipse/example/library/impl/EStringToBookMapEntryImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.java/src/org/eclipse/example/library/impl/EStringToBookMapEntryImpl.java
index 8237583..d959492 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.java/src/org/eclipse/example/library/impl/EStringToBookMapEntryImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.java/src/org/eclipse/example/library/impl/EStringToBookMapEntryImpl.java
@@ -23,7 +23,6 @@
  * An implementation of the model object '<em><b>EString To Book Map Entry</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.java/src/org/eclipse/example/library/impl/EStringToWriterMapEntryImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.java/src/org/eclipse/example/library/impl/EStringToWriterMapEntryImpl.java
index b3f3593..0419ca4 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.java/src/org/eclipse/example/library/impl/EStringToWriterMapEntryImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.java/src/org/eclipse/example/library/impl/EStringToWriterMapEntryImpl.java
@@ -23,7 +23,6 @@
  * An implementation of the model object '<em><b>EString To Writer Map Entry</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.java/src/org/eclipse/example/library/impl/LibraryImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.java/src/org/eclipse/example/library/impl/LibraryImpl.java
index e951a47..6d5a288 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.java/src/org/eclipse/example/library/impl/LibraryImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.java/src/org/eclipse/example/library/impl/LibraryImpl.java
@@ -34,7 +34,6 @@
  * An implementation of the model object '<em><b>Library</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.java/src/org/eclipse/example/library/impl/WriterImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.java/src/org/eclipse/example/library/impl/WriterImpl.java
index 587ccb4..d886f97 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.java/src/org/eclipse/example/library/impl/WriterImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.java/src/org/eclipse/example/library/impl/WriterImpl.java
@@ -28,7 +28,6 @@
  * An implementation of the model object '<em><b>Writer</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.rose/src/org/examples/library/impl/BookImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.rose/src/org/examples/library/impl/BookImpl.java
index ed1020e..29643dd 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.rose/src/org/examples/library/impl/BookImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.rose/src/org/examples/library/impl/BookImpl.java
@@ -22,7 +22,6 @@
  * An implementation of the model object '<em><b>Book</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.rose/src/org/examples/library/impl/LibraryImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.rose/src/org/examples/library/impl/LibraryImpl.java
index ccfc031..18c3d32 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.rose/src/org/examples/library/impl/LibraryImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.rose/src/org/examples/library/impl/LibraryImpl.java
@@ -29,7 +29,6 @@
  * An implementation of the model object '<em><b>Library</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.rose/src/org/examples/library/impl/WriterImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.rose/src/org/examples/library/impl/WriterImpl.java
index 21ab116..037be87 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.rose/src/org/examples/library/impl/WriterImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.rose/src/org/examples/library/impl/WriterImpl.java
@@ -28,7 +28,6 @@
  * An implementation of the model object '<em><b>Writer</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.xsd/src/org/examples/library/impl/BookImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.xsd/src/org/examples/library/impl/BookImpl.java
index 0211025..4cfead0 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.xsd/src/org/examples/library/impl/BookImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.xsd/src/org/examples/library/impl/BookImpl.java
@@ -22,7 +22,6 @@
  * An implementation of the model object '<em><b>Book</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.xsd/src/org/examples/library/impl/LibraryImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.xsd/src/org/examples/library/impl/LibraryImpl.java
index ccfc031..18c3d32 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.xsd/src/org/examples/library/impl/LibraryImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.xsd/src/org/examples/library/impl/LibraryImpl.java
@@ -29,7 +29,6 @@
  * An implementation of the model object '<em><b>Library</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.xsd/src/org/examples/library/impl/WriterImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.xsd/src/org/examples/library/impl/WriterImpl.java
index 21ab116..037be87 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.xsd/src/org/examples/library/impl/WriterImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.xsd/src/org/examples/library/impl/WriterImpl.java
@@ -28,7 +28,6 @@
  * An implementation of the model object '<em><b>Writer</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.xsds/src/org/examples/library/elements/impl/BookImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.xsds/src/org/examples/library/elements/impl/BookImpl.java
index 406d0f9..0e4ce64 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.xsds/src/org/examples/library/elements/impl/BookImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.xsds/src/org/examples/library/elements/impl/BookImpl.java
@@ -22,7 +22,6 @@
  * An implementation of the model object '<em><b>Book</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.xsds/src/org/examples/library/elements/impl/WriterImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.xsds/src/org/examples/library/elements/impl/WriterImpl.java
index 7a6fdb2..91a65e1 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.xsds/src/org/examples/library/elements/impl/WriterImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.xsds/src/org/examples/library/elements/impl/WriterImpl.java
@@ -28,7 +28,6 @@
  * An implementation of the model object '<em><b>Writer</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.xsds/src/org/examples/library/impl/LibraryImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.xsds/src/org/examples/library/impl/LibraryImpl.java
index 695b0a1..acc90b2 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.xsds/src/org/examples/library/impl/LibraryImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.xsds/src/org/examples/library/impl/LibraryImpl.java
@@ -30,7 +30,6 @@
  * An implementation of the model object '<em><b>Library</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.ecore/src/org/examples/hr/impl/PersonImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.ecore/src/org/examples/hr/impl/PersonImpl.java
index ed5ed27..09dcf68 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.ecore/src/org/examples/hr/impl/PersonImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.ecore/src/org/examples/hr/impl/PersonImpl.java
@@ -30,7 +30,6 @@
  * An implementation of the model object '<em><b>Person</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.ecore/src/org/examples/library/impl/BookImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.ecore/src/org/examples/library/impl/BookImpl.java
index a6f1e31..bca7cd8 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.ecore/src/org/examples/library/impl/BookImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.ecore/src/org/examples/library/impl/BookImpl.java
@@ -22,7 +22,6 @@
  * An implementation of the model object '<em><b>Book</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.ecore/src/org/examples/library/impl/LibraryImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.ecore/src/org/examples/library/impl/LibraryImpl.java
index 9bd7ce3..170d03f 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.ecore/src/org/examples/library/impl/LibraryImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.ecore/src/org/examples/library/impl/LibraryImpl.java
@@ -32,7 +32,6 @@
  * An implementation of the model object '<em><b>Library</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.ecore/src/org/examples/library/impl/WriterImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.ecore/src/org/examples/library/impl/WriterImpl.java
index 4fcfbe7..486470a 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.ecore/src/org/examples/library/impl/WriterImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.ecore/src/org/examples/library/impl/WriterImpl.java
@@ -29,7 +29,6 @@
  * An implementation of the model object '<em><b>Writer</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.rose/src/org/examples/hr/impl/PersonImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.rose/src/org/examples/hr/impl/PersonImpl.java
index ed5ed27..09dcf68 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.rose/src/org/examples/hr/impl/PersonImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.rose/src/org/examples/hr/impl/PersonImpl.java
@@ -30,7 +30,6 @@
  * An implementation of the model object '<em><b>Person</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.rose/src/org/examples/library/impl/BookImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.rose/src/org/examples/library/impl/BookImpl.java
index a6f1e31..bca7cd8 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.rose/src/org/examples/library/impl/BookImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.rose/src/org/examples/library/impl/BookImpl.java
@@ -22,7 +22,6 @@
  * An implementation of the model object '<em><b>Book</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.rose/src/org/examples/library/impl/LibraryImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.rose/src/org/examples/library/impl/LibraryImpl.java
index 9bd7ce3..170d03f 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.rose/src/org/examples/library/impl/LibraryImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.rose/src/org/examples/library/impl/LibraryImpl.java
@@ -32,7 +32,6 @@
  * An implementation of the model object '<em><b>Library</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.rose/src/org/examples/library/impl/WriterImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.rose/src/org/examples/library/impl/WriterImpl.java
index 4fcfbe7..486470a 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.rose/src/org/examples/library/impl/WriterImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.rose/src/org/examples/library/impl/WriterImpl.java
@@ -29,7 +29,6 @@
  * An implementation of the model object '<em><b>Writer</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsd/src/org/examples/library/impl/BookImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsd/src/org/examples/library/impl/BookImpl.java
index 0fbcd8b..d71ba28 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsd/src/org/examples/library/impl/BookImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsd/src/org/examples/library/impl/BookImpl.java
@@ -22,7 +22,6 @@
  * An implementation of the model object '<em><b>Book</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsd/src/org/examples/library/impl/LibraryImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsd/src/org/examples/library/impl/LibraryImpl.java
index 45ae777..6961ab0 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsd/src/org/examples/library/impl/LibraryImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsd/src/org/examples/library/impl/LibraryImpl.java
@@ -29,7 +29,6 @@
  * An implementation of the model object '<em><b>Library</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsd/src/org/examples/library/impl/WriterImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsd/src/org/examples/library/impl/WriterImpl.java
index 42083f2..8e8df3b 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsd/src/org/examples/library/impl/WriterImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsd/src/org/examples/library/impl/WriterImpl.java
@@ -28,7 +28,6 @@
  * An implementation of the model object '<em><b>Writer</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/elements/impl/BookImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/elements/impl/BookImpl.java
index cca5b0b..852b229 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/elements/impl/BookImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/elements/impl/BookImpl.java
@@ -23,7 +23,6 @@
  * An implementation of the model object '<em><b>Book</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/elements/impl/WriterImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/elements/impl/WriterImpl.java
index 738a362..6887104 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/elements/impl/WriterImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/elements/impl/WriterImpl.java
@@ -31,7 +31,6 @@
  * An implementation of the model object '<em><b>Writer</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/hr/impl/PersonImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/hr/impl/PersonImpl.java
index 7e04f46..b2de25c 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/hr/impl/PersonImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/hr/impl/PersonImpl.java
@@ -23,7 +23,6 @@
  * An implementation of the model object '<em><b>Person</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/impl/LibraryImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/impl/LibraryImpl.java
index 4b770fd..83eb7d6 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/impl/LibraryImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/impl/LibraryImpl.java
@@ -33,7 +33,6 @@
  * An implementation of the model object '<em><b>Library</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.ecore/src/org/examples/library/impl/BookImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.ecore/src/org/examples/library/impl/BookImpl.java
index ed1020e..29643dd 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.ecore/src/org/examples/library/impl/BookImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.ecore/src/org/examples/library/impl/BookImpl.java
@@ -22,7 +22,6 @@
  * An implementation of the model object '<em><b>Book</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.ecore/src/org/examples/library/impl/LibraryImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.ecore/src/org/examples/library/impl/LibraryImpl.java
index ccfc031..18c3d32 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.ecore/src/org/examples/library/impl/LibraryImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.ecore/src/org/examples/library/impl/LibraryImpl.java
@@ -29,7 +29,6 @@
  * An implementation of the model object '<em><b>Library</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.ecore/src/org/examples/library/impl/WriterImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.ecore/src/org/examples/library/impl/WriterImpl.java
index 21ab116..037be87 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.ecore/src/org/examples/library/impl/WriterImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.ecore/src/org/examples/library/impl/WriterImpl.java
@@ -28,7 +28,6 @@
  * An implementation of the model object '<em><b>Writer</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.rose/src/org/examples/library/impl/BookImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.rose/src/org/examples/library/impl/BookImpl.java
index ed1020e..29643dd 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.rose/src/org/examples/library/impl/BookImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.rose/src/org/examples/library/impl/BookImpl.java
@@ -22,7 +22,6 @@
  * An implementation of the model object '<em><b>Book</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.rose/src/org/examples/library/impl/LibraryImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.rose/src/org/examples/library/impl/LibraryImpl.java
index ccfc031..18c3d32 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.rose/src/org/examples/library/impl/LibraryImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.rose/src/org/examples/library/impl/LibraryImpl.java
@@ -29,7 +29,6 @@
  * An implementation of the model object '<em><b>Library</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.rose/src/org/examples/library/impl/WriterImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.rose/src/org/examples/library/impl/WriterImpl.java
index 21ab116..037be87 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.rose/src/org/examples/library/impl/WriterImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.rose/src/org/examples/library/impl/WriterImpl.java
@@ -28,7 +28,6 @@
  * An implementation of the model object '<em><b>Writer</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.xsd/src/org/examples/library/impl/BookImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.xsd/src/org/examples/library/impl/BookImpl.java
index 0211025..4cfead0 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.xsd/src/org/examples/library/impl/BookImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.xsd/src/org/examples/library/impl/BookImpl.java
@@ -22,7 +22,6 @@
  * An implementation of the model object '<em><b>Book</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.xsd/src/org/examples/library/impl/LibraryImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.xsd/src/org/examples/library/impl/LibraryImpl.java
index ccfc031..18c3d32 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.xsd/src/org/examples/library/impl/LibraryImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.xsd/src/org/examples/library/impl/LibraryImpl.java
@@ -29,7 +29,6 @@
  * An implementation of the model object '<em><b>Library</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.xsd/src/org/examples/library/impl/WriterImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.xsd/src/org/examples/library/impl/WriterImpl.java
index 21ab116..037be87 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.xsd/src/org/examples/library/impl/WriterImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.xsd/src/org/examples/library/impl/WriterImpl.java
@@ -28,7 +28,6 @@
  * An implementation of the model object '<em><b>Writer</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.xsds/src/org/examples/library/elements/impl/BookImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.xsds/src/org/examples/library/elements/impl/BookImpl.java
index 406d0f9..0e4ce64 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.xsds/src/org/examples/library/elements/impl/BookImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.xsds/src/org/examples/library/elements/impl/BookImpl.java
@@ -22,7 +22,6 @@
  * An implementation of the model object '<em><b>Book</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.xsds/src/org/examples/library/elements/impl/WriterImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.xsds/src/org/examples/library/elements/impl/WriterImpl.java
index 7a6fdb2..91a65e1 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.xsds/src/org/examples/library/elements/impl/WriterImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.xsds/src/org/examples/library/elements/impl/WriterImpl.java
@@ -28,7 +28,6 @@
  * An implementation of the model object '<em><b>Writer</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.xsds/src/org/examples/library/impl/LibraryImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.xsds/src/org/examples/library/impl/LibraryImpl.java
index 695b0a1..acc90b2 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.xsds/src/org/examples/library/impl/LibraryImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.xsds/src/org/examples/library/impl/LibraryImpl.java
@@ -30,7 +30,6 @@
  * An implementation of the model object '<em><b>Library</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/hr/impl/PersonImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/hr/impl/PersonImpl.java
index 7af8753..eac987d 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/hr/impl/PersonImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/hr/impl/PersonImpl.java
@@ -30,7 +30,6 @@
  * An implementation of the model object '<em><b>Person</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/library/impl/BookImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/library/impl/BookImpl.java
index 8beb49e..56205a4 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/library/impl/BookImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/library/impl/BookImpl.java
@@ -22,7 +22,6 @@
  * An implementation of the model object '<em><b>Book</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/library/impl/LibraryImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/library/impl/LibraryImpl.java
index 2ffe861..6976265 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/library/impl/LibraryImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/library/impl/LibraryImpl.java
@@ -32,7 +32,6 @@
  * An implementation of the model object '<em><b>Library</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/library/impl/WriterImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/library/impl/WriterImpl.java
index 2c1632f..b1f6da4 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/library/impl/WriterImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/library/impl/WriterImpl.java
@@ -20,7 +20,6 @@
  * An implementation of the model object '<em><b>Writer</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/library/util/LibrarySwitch.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/library/util/LibrarySwitch.java
index 6df38f6..cf382e7 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/library/util/LibrarySwitch.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/library/util/LibrarySwitch.java
@@ -3,9 +3,7 @@
  */
 package org.examples.library.util;
 
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.Switch;
 import org.examples.hr.Person;
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/hr/impl/PersonImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/hr/impl/PersonImpl.java
index 7af8753..eac987d 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/hr/impl/PersonImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/hr/impl/PersonImpl.java
@@ -30,7 +30,6 @@
  * An implementation of the model object '<em><b>Person</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/library/impl/BookImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/library/impl/BookImpl.java
index 8beb49e..56205a4 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/library/impl/BookImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/library/impl/BookImpl.java
@@ -22,7 +22,6 @@
  * An implementation of the model object '<em><b>Book</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/library/impl/LibraryImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/library/impl/LibraryImpl.java
index 2ffe861..6976265 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/library/impl/LibraryImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/library/impl/LibraryImpl.java
@@ -32,7 +32,6 @@
  * An implementation of the model object '<em><b>Library</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/library/impl/WriterImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/library/impl/WriterImpl.java
index 2c1632f..b1f6da4 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/library/impl/WriterImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/library/impl/WriterImpl.java
@@ -20,7 +20,6 @@
  * An implementation of the model object '<em><b>Writer</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/library/util/LibrarySwitch.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/library/util/LibrarySwitch.java
index 6df38f6..cf382e7 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/library/util/LibrarySwitch.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/library/util/LibrarySwitch.java
@@ -3,9 +3,7 @@
  */
 package org.examples.library.util;
 
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.Switch;
 import org.examples.hr.Person;
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsd/src/org/examples/library/impl/BookImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsd/src/org/examples/library/impl/BookImpl.java
index e92f2da..c9a4506 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsd/src/org/examples/library/impl/BookImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsd/src/org/examples/library/impl/BookImpl.java
@@ -22,7 +22,6 @@
  * An implementation of the model object '<em><b>Book</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsd/src/org/examples/library/impl/LibraryImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsd/src/org/examples/library/impl/LibraryImpl.java
index ef59f8e..4693c97 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsd/src/org/examples/library/impl/LibraryImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsd/src/org/examples/library/impl/LibraryImpl.java
@@ -29,7 +29,6 @@
  * An implementation of the model object '<em><b>Library</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsd/src/org/examples/library/impl/WriterImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsd/src/org/examples/library/impl/WriterImpl.java
index e9a0d55..32595e2 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsd/src/org/examples/library/impl/WriterImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsd/src/org/examples/library/impl/WriterImpl.java
@@ -28,7 +28,6 @@
  * An implementation of the model object '<em><b>Writer</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsd/src/org/examples/library/util/LibrarySwitch.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsd/src/org/examples/library/util/LibrarySwitch.java
index 64e08bc..b222cfe 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsd/src/org/examples/library/util/LibrarySwitch.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsd/src/org/examples/library/util/LibrarySwitch.java
@@ -3,9 +3,7 @@
  */
 package org.examples.library.util;
 
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.Switch;
 import org.examples.library.*;
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/elements/impl/BookImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/elements/impl/BookImpl.java
index 9490a48..a85bd3d 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/elements/impl/BookImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/elements/impl/BookImpl.java
@@ -18,7 +18,6 @@
  * An implementation of the model object '<em><b>Book</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/elements/impl/WriterImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/elements/impl/WriterImpl.java
index 4cb4da0..41f4c46 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/elements/impl/WriterImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/elements/impl/WriterImpl.java
@@ -17,7 +17,6 @@
  * An implementation of the model object '<em><b>Writer</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/elements/util/ElementsSwitch.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/elements/util/ElementsSwitch.java
index e32f04a..27b3d13 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/elements/util/ElementsSwitch.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/elements/util/ElementsSwitch.java
@@ -3,9 +3,7 @@
  */
 package org.examples.library.elements.util;
 
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.Switch;
 import org.examples.library.elements.*;
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/hr/impl/PersonImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/hr/impl/PersonImpl.java
index 2c15a1b..0ea32fe 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/hr/impl/PersonImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/hr/impl/PersonImpl.java
@@ -23,7 +23,6 @@
  * An implementation of the model object '<em><b>Person</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/impl/LibraryImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/impl/LibraryImpl.java
index 7c105d6..506b8b1 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/impl/LibraryImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/impl/LibraryImpl.java
@@ -33,7 +33,6 @@
  * An implementation of the model object '<em><b>Library</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/util/LibrarySwitch.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/util/LibrarySwitch.java
index 1e8124d..04d21a1 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/util/LibrarySwitch.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/util/LibrarySwitch.java
@@ -3,9 +3,7 @@
  */
 package org.examples.library.util;
 
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.Switch;
 import org.examples.library.*;
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.ecore/src/org/examples/library/impl/BookImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.ecore/src/org/examples/library/impl/BookImpl.java
index 12a143b..c7ff7e7 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.ecore/src/org/examples/library/impl/BookImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.ecore/src/org/examples/library/impl/BookImpl.java
@@ -22,7 +22,6 @@
  * An implementation of the model object '<em><b>Book</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.ecore/src/org/examples/library/impl/LibraryImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.ecore/src/org/examples/library/impl/LibraryImpl.java
index be6ed42..be33882 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.ecore/src/org/examples/library/impl/LibraryImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.ecore/src/org/examples/library/impl/LibraryImpl.java
@@ -29,7 +29,6 @@
  * An implementation of the model object '<em><b>Library</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.ecore/src/org/examples/library/impl/WriterImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.ecore/src/org/examples/library/impl/WriterImpl.java
index 444e4ac..f4b616e 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.ecore/src/org/examples/library/impl/WriterImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.ecore/src/org/examples/library/impl/WriterImpl.java
@@ -28,7 +28,6 @@
  * An implementation of the model object '<em><b>Writer</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.java/src/org/eclipse/example/library/impl/BookImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.java/src/org/eclipse/example/library/impl/BookImpl.java
index 45aee43..cb5d98c 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.java/src/org/eclipse/example/library/impl/BookImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.java/src/org/eclipse/example/library/impl/BookImpl.java
@@ -22,7 +22,6 @@
  * An implementation of the model object '<em><b>Book</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.java/src/org/eclipse/example/library/impl/LibraryImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.java/src/org/eclipse/example/library/impl/LibraryImpl.java
index b560f27..255526a 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.java/src/org/eclipse/example/library/impl/LibraryImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.java/src/org/eclipse/example/library/impl/LibraryImpl.java
@@ -37,7 +37,6 @@
  * An implementation of the model object '<em><b>Library</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.java/src/org/eclipse/example/library/impl/MapOfDataTypesImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.java/src/org/eclipse/example/library/impl/MapOfDataTypesImpl.java
index f728111..86c2f7d 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.java/src/org/eclipse/example/library/impl/MapOfDataTypesImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.java/src/org/eclipse/example/library/impl/MapOfDataTypesImpl.java
@@ -21,7 +21,6 @@
  * An implementation of the model object '<em><b>Map Of Data Types</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.java/src/org/eclipse/example/library/impl/WriterImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.java/src/org/eclipse/example/library/impl/WriterImpl.java
index 0295132..e15101c 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.java/src/org/eclipse/example/library/impl/WriterImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.java/src/org/eclipse/example/library/impl/WriterImpl.java
@@ -28,7 +28,6 @@
  * An implementation of the model object '<em><b>Writer</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.java/src/org/eclipse/example/library/impl/WriterNameMapImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.java/src/org/eclipse/example/library/impl/WriterNameMapImpl.java
index 913a61d..fcf5b5a 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.java/src/org/eclipse/example/library/impl/WriterNameMapImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.java/src/org/eclipse/example/library/impl/WriterNameMapImpl.java
@@ -23,7 +23,6 @@
  * An implementation of the model object '<em><b>Writer Name Map</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.rose/src/org/examples/library/impl/BookImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.rose/src/org/examples/library/impl/BookImpl.java
index 12a143b..c7ff7e7 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.rose/src/org/examples/library/impl/BookImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.rose/src/org/examples/library/impl/BookImpl.java
@@ -22,7 +22,6 @@
  * An implementation of the model object '<em><b>Book</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.rose/src/org/examples/library/impl/LibraryImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.rose/src/org/examples/library/impl/LibraryImpl.java
index be6ed42..be33882 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.rose/src/org/examples/library/impl/LibraryImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.rose/src/org/examples/library/impl/LibraryImpl.java
@@ -29,7 +29,6 @@
  * An implementation of the model object '<em><b>Library</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.rose/src/org/examples/library/impl/WriterImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.rose/src/org/examples/library/impl/WriterImpl.java
index 444e4ac..f4b616e 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.rose/src/org/examples/library/impl/WriterImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.rose/src/org/examples/library/impl/WriterImpl.java
@@ -28,7 +28,6 @@
  * An implementation of the model object '<em><b>Writer</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.xsd/src/org/examples/library/impl/BookImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.xsd/src/org/examples/library/impl/BookImpl.java
index adc92a3..fd24477 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.xsd/src/org/examples/library/impl/BookImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.xsd/src/org/examples/library/impl/BookImpl.java
@@ -22,7 +22,6 @@
  * An implementation of the model object '<em><b>Book</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.xsd/src/org/examples/library/impl/LibraryImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.xsd/src/org/examples/library/impl/LibraryImpl.java
index be6ed42..be33882 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.xsd/src/org/examples/library/impl/LibraryImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.xsd/src/org/examples/library/impl/LibraryImpl.java
@@ -29,7 +29,6 @@
  * An implementation of the model object '<em><b>Library</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.xsd/src/org/examples/library/impl/WriterImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.xsd/src/org/examples/library/impl/WriterImpl.java
index 444e4ac..f4b616e 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.xsd/src/org/examples/library/impl/WriterImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.xsd/src/org/examples/library/impl/WriterImpl.java
@@ -28,7 +28,6 @@
  * An implementation of the model object '<em><b>Writer</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.xsds/src/org/examples/library/elements/impl/BookImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.xsds/src/org/examples/library/elements/impl/BookImpl.java
index 4e1b010..f2dcd38 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.xsds/src/org/examples/library/elements/impl/BookImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.xsds/src/org/examples/library/elements/impl/BookImpl.java
@@ -22,7 +22,6 @@
  * An implementation of the model object '<em><b>Book</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.xsds/src/org/examples/library/elements/impl/WriterImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.xsds/src/org/examples/library/elements/impl/WriterImpl.java
index 66e890b..f0c4263 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.xsds/src/org/examples/library/elements/impl/WriterImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.xsds/src/org/examples/library/elements/impl/WriterImpl.java
@@ -28,7 +28,6 @@
  * An implementation of the model object '<em><b>Writer</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.xsds/src/org/examples/library/impl/LibraryImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.xsds/src/org/examples/library/impl/LibraryImpl.java
index 75977ad..4d32182 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.xsds/src/org/examples/library/impl/LibraryImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.xsds/src/org/examples/library/impl/LibraryImpl.java
@@ -30,7 +30,6 @@
  * An implementation of the model object '<em><b>Library</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.ecore/src/org/examples/hr/impl/PersonImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.ecore/src/org/examples/hr/impl/PersonImpl.java
index 7af8753..eac987d 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.ecore/src/org/examples/hr/impl/PersonImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.ecore/src/org/examples/hr/impl/PersonImpl.java
@@ -30,7 +30,6 @@
  * An implementation of the model object '<em><b>Person</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.ecore/src/org/examples/library/impl/BookImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.ecore/src/org/examples/library/impl/BookImpl.java
index 8beb49e..56205a4 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.ecore/src/org/examples/library/impl/BookImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.ecore/src/org/examples/library/impl/BookImpl.java
@@ -22,7 +22,6 @@
  * An implementation of the model object '<em><b>Book</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.ecore/src/org/examples/library/impl/LibraryImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.ecore/src/org/examples/library/impl/LibraryImpl.java
index 2ffe861..6976265 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.ecore/src/org/examples/library/impl/LibraryImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.ecore/src/org/examples/library/impl/LibraryImpl.java
@@ -32,7 +32,6 @@
  * An implementation of the model object '<em><b>Library</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.ecore/src/org/examples/library/impl/WriterImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.ecore/src/org/examples/library/impl/WriterImpl.java
index accfd3f..9467189 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.ecore/src/org/examples/library/impl/WriterImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.ecore/src/org/examples/library/impl/WriterImpl.java
@@ -29,7 +29,6 @@
  * An implementation of the model object '<em><b>Writer</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.rose/src/org/examples/hr/impl/PersonImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.rose/src/org/examples/hr/impl/PersonImpl.java
index 7af8753..eac987d 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.rose/src/org/examples/hr/impl/PersonImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.rose/src/org/examples/hr/impl/PersonImpl.java
@@ -30,7 +30,6 @@
  * An implementation of the model object '<em><b>Person</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.rose/src/org/examples/library/impl/BookImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.rose/src/org/examples/library/impl/BookImpl.java
index 8beb49e..56205a4 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.rose/src/org/examples/library/impl/BookImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.rose/src/org/examples/library/impl/BookImpl.java
@@ -22,7 +22,6 @@
  * An implementation of the model object '<em><b>Book</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.rose/src/org/examples/library/impl/LibraryImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.rose/src/org/examples/library/impl/LibraryImpl.java
index 2ffe861..6976265 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.rose/src/org/examples/library/impl/LibraryImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.rose/src/org/examples/library/impl/LibraryImpl.java
@@ -32,7 +32,6 @@
  * An implementation of the model object '<em><b>Library</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.rose/src/org/examples/library/impl/WriterImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.rose/src/org/examples/library/impl/WriterImpl.java
index accfd3f..9467189 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.rose/src/org/examples/library/impl/WriterImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.rose/src/org/examples/library/impl/WriterImpl.java
@@ -29,7 +29,6 @@
  * An implementation of the model object '<em><b>Writer</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsd/src/org/examples/library/impl/BookImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsd/src/org/examples/library/impl/BookImpl.java
index e92f2da..c9a4506 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsd/src/org/examples/library/impl/BookImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsd/src/org/examples/library/impl/BookImpl.java
@@ -22,7 +22,6 @@
  * An implementation of the model object '<em><b>Book</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsd/src/org/examples/library/impl/LibraryImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsd/src/org/examples/library/impl/LibraryImpl.java
index ef59f8e..4693c97 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsd/src/org/examples/library/impl/LibraryImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsd/src/org/examples/library/impl/LibraryImpl.java
@@ -29,7 +29,6 @@
  * An implementation of the model object '<em><b>Library</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsd/src/org/examples/library/impl/WriterImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsd/src/org/examples/library/impl/WriterImpl.java
index e9a0d55..32595e2 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsd/src/org/examples/library/impl/WriterImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsd/src/org/examples/library/impl/WriterImpl.java
@@ -28,7 +28,6 @@
  * An implementation of the model object '<em><b>Writer</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/elements/impl/BookImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/elements/impl/BookImpl.java
index 3172eb0..9cd2a72 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/elements/impl/BookImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/elements/impl/BookImpl.java
@@ -23,7 +23,6 @@
  * An implementation of the model object '<em><b>Book</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/elements/impl/WriterImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/elements/impl/WriterImpl.java
index e985ef3..4009d25 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/elements/impl/WriterImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/elements/impl/WriterImpl.java
@@ -31,7 +31,6 @@
  * An implementation of the model object '<em><b>Writer</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/hr/impl/PersonImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/hr/impl/PersonImpl.java
index 2c15a1b..0ea32fe 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/hr/impl/PersonImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/hr/impl/PersonImpl.java
@@ -23,7 +23,6 @@
  * An implementation of the model object '<em><b>Person</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/impl/LibraryImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/impl/LibraryImpl.java
index 7c105d6..506b8b1 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/impl/LibraryImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/impl/LibraryImpl.java
@@ -33,7 +33,6 @@
  * An implementation of the model object '<em><b>Library</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * <p>
  * The following features are implemented:
  * </p>
  * <ul>