[204200] Recompiling based on changes in EMF for bug 232381.v200805171802

1 files changed, 264 insertions, 241 deletions

diff --git a/plugins/org.eclipse.uml2.codegen.ecore/src/org/eclipse/uml2/codegen/ecore/templates/model/tests/TestCase.java b/plugins/org.eclipse.uml2.codegen.ecore/src/org/eclipse/uml2/codegen/ecore/templates/model/tests/TestCase.java
index fc9bbc3ad..f26918c55 100644
--- a/plugins/org.eclipse.uml2.codegen.ecore/src/org/eclipse/uml2/codegen/ecore/templates/model/tests/TestCase.java
+++ b/plugins/org.eclipse.uml2.codegen.ecore/src/org/eclipse/uml2/codegen/ecore/templates/model/tests/TestCase.java
@@ -76,127 +76,134 @@ public class TestCase
   protected final String TEXT_58 = NL + "\t}";
   protected final String TEXT_59 = NL + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @see junit.framework.TestCase#setUp()" + NL + "\t * @generated" + NL + "\t */";
   protected final String TEXT_60 = NL + "\t@Override";
-  protected final String TEXT_61 = NL + "\tprotected void setUp() throws Exception" + NL + "\t{" + NL + "\t\tsetFixture(";
-  protected final String TEXT_62 = ".create";
-  protected final String TEXT_63 = "());" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @see junit.framework.TestCase#tearDown()" + NL + "\t * @generated" + NL + "\t */";
-  protected final String TEXT_64 = NL + "\t@Override";
-  protected final String TEXT_65 = NL + "\tprotected void tearDown() throws Exception" + NL + "\t{" + NL + "\t\tsetFixture(null);" + NL + "\t}";
-  protected final String TEXT_66 = NL + NL + "\t/**" + NL + "\t * Tests the '{@link ";
-  protected final String TEXT_67 = "#";
-  protected final String TEXT_68 = "() <em>";
-  protected final String TEXT_69 = "</em>}' feature getter." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @see ";
-  protected final String TEXT_70 = "#";
-  protected final String TEXT_71 = "()" + NL + "\t * @generated" + NL + "\t */";
-  protected final String TEXT_72 = NL + "\t@Override";
-  protected final String TEXT_73 = NL + "\tpublic void test";
-  protected final String TEXT_74 = "()" + NL + "\t{";
-  protected final String TEXT_75 = NL;
-  protected final String TEXT_76 = "\t\t// TODO: implement this feature getter test method" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT";
-  protected final String TEXT_77 = NL + "\t}";
-  protected final String TEXT_78 = NL + NL + "\t/**" + NL + "\t * Tests the '{@link ";
-  protected final String TEXT_79 = "#set";
-  protected final String TEXT_80 = "(";
-  protected final String TEXT_81 = ") <em>";
-  protected final String TEXT_82 = "</em>}' feature setter." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @see ";
-  protected final String TEXT_83 = "#set";
-  protected final String TEXT_84 = "(";
-  protected final String TEXT_85 = ")" + NL + "\t * @generated" + NL + "\t */";
-  protected final String TEXT_86 = NL + "\t@Override";
-  protected final String TEXT_87 = NL + "\tpublic void testSet";
-  protected final String TEXT_88 = "()" + NL + "\t{";
-  protected final String TEXT_89 = NL;
-  protected final String TEXT_90 = "\t\t// TODO: implement this feature getter test method" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT";
-  protected final String TEXT_91 = NL + "\t}";
-  protected final String TEXT_92 = NL + NL + "\t/**" + NL + "\t * Tests the '{@link ";
-  protected final String TEXT_93 = "#unset";
-  protected final String TEXT_94 = "() <em>unset";
-  protected final String TEXT_95 = "()</em>}' method." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @see ";
-  protected final String TEXT_96 = "#unset";
-  protected final String TEXT_97 = "()" + NL + "\t * @generated" + NL + "\t */";
-  protected final String TEXT_98 = NL + "\t@Override";
-  protected final String TEXT_99 = NL + "\tpublic void testUnset";
-  protected final String TEXT_100 = "()" + NL + "\t{";
-  protected final String TEXT_101 = NL;
-  protected final String TEXT_102 = "\t\t// TODO: implement this feature getter test method" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT";
-  protected final String TEXT_103 = NL + "\t}";
-  protected final String TEXT_104 = NL + NL + "\t/**" + NL + "\t * Tests the '{@link ";
-  protected final String TEXT_105 = "#isSet";
-  protected final String TEXT_106 = "() <em>isSet";
-  protected final String TEXT_107 = "()</em>}' method." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @see ";
-  protected final String TEXT_108 = "#isSet";
-  protected final String TEXT_109 = "()" + NL + "\t * @generated" + NL + "\t */";
-  protected final String TEXT_110 = NL + "\t@Override";
-  protected final String TEXT_111 = NL + "\tpublic void testIsSet";
-  protected final String TEXT_112 = "()" + NL + "\t{";
-  protected final String TEXT_113 = NL;
-  protected final String TEXT_114 = "\t\t// TODO: implement this feature getter test method" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT";
-  protected final String TEXT_115 = NL + "\t}";
-  protected final String TEXT_116 = NL + NL + "\t/**" + NL + "\t * Tests the '{@link ";
-  protected final String TEXT_117 = "#";
-  protected final String TEXT_118 = "(";
-  protected final String TEXT_119 = ") <em>";
-  protected final String TEXT_120 = "</em>}' operation." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @see ";
-  protected final String TEXT_121 = "#";
-  protected final String TEXT_122 = "(";
-  protected final String TEXT_123 = ")" + NL + "\t * @generated" + NL + "\t */";
-  protected final String TEXT_124 = NL + "\t@Override";
-  protected final String TEXT_125 = NL + "\tpublic void test";
-  protected final String TEXT_126 = "()" + NL + "\t{";
-  protected final String TEXT_127 = NL;
-  protected final String TEXT_128 = "\t\t// TODO: implement this feature getter test method" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT";
-  protected final String TEXT_129 = NL + "\t}";
-  protected final String TEXT_130 = NL;
-  protected final String TEXT_131 = NL + NL + "\t/**" + NL + "\t * Tests the '{@link ";
-  protected final String TEXT_132 = "#";
-  protected final String TEXT_133 = "() <em>";
-  protected final String TEXT_134 = "</em>}' feature getter." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @see ";
-  protected final String TEXT_135 = "#";
-  protected final String TEXT_136 = "()" + NL + "\t * @generated" + NL + "\t */";
-  protected final String TEXT_137 = NL + "\t@Override";
-  protected final String TEXT_138 = NL + "\tpublic void test";
-  protected final String TEXT_139 = "()" + NL + "\t{" + NL + "\t\t// TODO: implement this redefined feature getter test method" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t}";
-  protected final String TEXT_140 = NL + NL + "\t/**" + NL + "\t * Tests the '{@link ";
-  protected final String TEXT_141 = "#set";
-  protected final String TEXT_142 = "(";
-  protected final String TEXT_143 = ") <em>";
-  protected final String TEXT_144 = "</em>}' feature setter." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @see ";
-  protected final String TEXT_145 = "#set";
-  protected final String TEXT_146 = "(";
-  protected final String TEXT_147 = ")" + NL + "\t * @generated" + NL + "\t */";
-  protected final String TEXT_148 = NL + "\t@Override";
-  protected final String TEXT_149 = NL + "\tpublic void testSet";
-  protected final String TEXT_150 = "()" + NL + "\t{" + NL + "\t\t// TODO: implement this redefined feature setter test method" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t}";
-  protected final String TEXT_151 = NL + NL + "\t/**" + NL + "\t * Tests the '{@link ";
-  protected final String TEXT_152 = "#unset";
-  protected final String TEXT_153 = "() <em>unset";
-  protected final String TEXT_154 = "()</em>}' method." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @see ";
-  protected final String TEXT_155 = "#unset";
-  protected final String TEXT_156 = "()" + NL + "\t * @generated" + NL + "\t */";
-  protected final String TEXT_157 = NL + "\t@Override";
-  protected final String TEXT_158 = NL + "\tpublic void testUnset";
-  protected final String TEXT_159 = "()" + NL + "\t{" + NL + "\t\t// TODO: implement this redefined test method" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t}";
-  protected final String TEXT_160 = NL + NL + "\t/**" + NL + "\t * Tests the '{@link ";
-  protected final String TEXT_161 = "#isSet";
-  protected final String TEXT_162 = "() <em>isSet";
-  protected final String TEXT_163 = "()</em>}' method." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @see ";
-  protected final String TEXT_164 = "#isSet";
-  protected final String TEXT_165 = "()" + NL + "\t * @generated" + NL + "\t */";
-  protected final String TEXT_166 = NL + "\t@Override";
-  protected final String TEXT_167 = NL + "\tpublic void testIsSet";
-  protected final String TEXT_168 = "()" + NL + "\t{" + NL + "\t\t// TODO: implement this redefined test method" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t}";
-  protected final String TEXT_169 = NL + NL + "\t/**" + NL + "\t * Tests the '{@link ";
-  protected final String TEXT_170 = "#";
-  protected final String TEXT_171 = "(";
-  protected final String TEXT_172 = ") <em>";
-  protected final String TEXT_173 = "</em>}' operation." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @see ";
-  protected final String TEXT_174 = "#";
-  protected final String TEXT_175 = "(";
-  protected final String TEXT_176 = ")" + NL + "\t * @generated" + NL + "\t */";
-  protected final String TEXT_177 = NL + "\t@Override";
-  protected final String TEXT_178 = NL + "\tpublic void test";
-  protected final String TEXT_179 = "()" + NL + "\t{" + NL + "\t\t// TODO: implement this redefined operation test method" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t}";
-  protected final String TEXT_180 = NL + "} //";
-  protected final String TEXT_181 = NL;
+  protected final String TEXT_61 = NL + "\t@SuppressWarnings(\"unchecked\")";
+  protected final String TEXT_62 = NL + "\tprotected void setUp() throws Exception" + NL + "\t{";
+  protected final String TEXT_63 = NL + "\t\tsetFixture((";
+  protected final String TEXT_64 = ")";
+  protected final String TEXT_65 = ".create(";
+  protected final String TEXT_66 = "));";
+  protected final String TEXT_67 = NL + "\t\tsetFixture(";
+  protected final String TEXT_68 = ".create";
+  protected final String TEXT_69 = "());";
+  protected final String TEXT_70 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @see junit.framework.TestCase#tearDown()" + NL + "\t * @generated" + NL + "\t */";
+  protected final String TEXT_71 = NL + "\t@Override";
+  protected final String TEXT_72 = NL + "\tprotected void tearDown() throws Exception" + NL + "\t{" + NL + "\t\tsetFixture(null);" + NL + "\t}";
+  protected final String TEXT_73 = NL + NL + "\t/**" + NL + "\t * Tests the '{@link ";
+  protected final String TEXT_74 = "#";
+  protected final String TEXT_75 = "() <em>";
+  protected final String TEXT_76 = "</em>}' feature getter." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @see ";
+  protected final String TEXT_77 = "#";
+  protected final String TEXT_78 = "()" + NL + "\t * @generated" + NL + "\t */";
+  protected final String TEXT_79 = NL + "\t@Override";
+  protected final String TEXT_80 = NL + "\tpublic void test";
+  protected final String TEXT_81 = "()" + NL + "\t{";
+  protected final String TEXT_82 = NL;
+  protected final String TEXT_83 = "\t\t// TODO: implement this feature getter test method" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT";
+  protected final String TEXT_84 = NL + "\t}";
+  protected final String TEXT_85 = NL + NL + "\t/**" + NL + "\t * Tests the '{@link ";
+  protected final String TEXT_86 = "#set";
+  protected final String TEXT_87 = "(";
+  protected final String TEXT_88 = ") <em>";
+  protected final String TEXT_89 = "</em>}' feature setter." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @see ";
+  protected final String TEXT_90 = "#set";
+  protected final String TEXT_91 = "(";
+  protected final String TEXT_92 = ")" + NL + "\t * @generated" + NL + "\t */";
+  protected final String TEXT_93 = NL + "\t@Override";
+  protected final String TEXT_94 = NL + "\tpublic void testSet";
+  protected final String TEXT_95 = "()" + NL + "\t{";
+  protected final String TEXT_96 = NL;
+  protected final String TEXT_97 = "\t\t// TODO: implement this feature getter test method" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT";
+  protected final String TEXT_98 = NL + "\t}";
+  protected final String TEXT_99 = NL + NL + "\t/**" + NL + "\t * Tests the '{@link ";
+  protected final String TEXT_100 = "#unset";
+  protected final String TEXT_101 = "() <em>unset";
+  protected final String TEXT_102 = "()</em>}' method." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @see ";
+  protected final String TEXT_103 = "#unset";
+  protected final String TEXT_104 = "()" + NL + "\t * @generated" + NL + "\t */";
+  protected final String TEXT_105 = NL + "\t@Override";
+  protected final String TEXT_106 = NL + "\tpublic void testUnset";
+  protected final String TEXT_107 = "()" + NL + "\t{";
+  protected final String TEXT_108 = NL;
+  protected final String TEXT_109 = "\t\t// TODO: implement this feature getter test method" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT";
+  protected final String TEXT_110 = NL + "\t}";
+  protected final String TEXT_111 = NL + NL + "\t/**" + NL + "\t * Tests the '{@link ";
+  protected final String TEXT_112 = "#isSet";
+  protected final String TEXT_113 = "() <em>isSet";
+  protected final String TEXT_114 = "()</em>}' method." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @see ";
+  protected final String TEXT_115 = "#isSet";
+  protected final String TEXT_116 = "()" + NL + "\t * @generated" + NL + "\t */";
+  protected final String TEXT_117 = NL + "\t@Override";
+  protected final String TEXT_118 = NL + "\tpublic void testIsSet";
+  protected final String TEXT_119 = "()" + NL + "\t{";
+  protected final String TEXT_120 = NL;
+  protected final String TEXT_121 = "\t\t// TODO: implement this feature getter test method" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT";
+  protected final String TEXT_122 = NL + "\t}";
+  protected final String TEXT_123 = NL + NL + "\t/**" + NL + "\t * Tests the '{@link ";
+  protected final String TEXT_124 = "#";
+  protected final String TEXT_125 = "(";
+  protected final String TEXT_126 = ") <em>";
+  protected final String TEXT_127 = "</em>}' operation." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @see ";
+  protected final String TEXT_128 = "#";
+  protected final String TEXT_129 = "(";
+  protected final String TEXT_130 = ")" + NL + "\t * @generated" + NL + "\t */";
+  protected final String TEXT_131 = NL + "\t@Override";
+  protected final String TEXT_132 = NL + "\tpublic void test";
+  protected final String TEXT_133 = "()" + NL + "\t{";
+  protected final String TEXT_134 = NL;
+  protected final String TEXT_135 = "\t\t// TODO: implement this feature getter test method" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT";
+  protected final String TEXT_136 = NL + "\t}";
+  protected final String TEXT_137 = NL;
+  protected final String TEXT_138 = NL + NL + "\t/**" + NL + "\t * Tests the '{@link ";
+  protected final String TEXT_139 = "#";
+  protected final String TEXT_140 = "() <em>";
+  protected final String TEXT_141 = "</em>}' feature getter." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @see ";
+  protected final String TEXT_142 = "#";
+  protected final String TEXT_143 = "()" + NL + "\t * @generated" + NL + "\t */";
+  protected final String TEXT_144 = NL + "\t@Override";
+  protected final String TEXT_145 = NL + "\tpublic void test";
+  protected final String TEXT_146 = "()" + NL + "\t{" + NL + "\t\t// TODO: implement this redefined feature getter test method" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t}";
+  protected final String TEXT_147 = NL + NL + "\t/**" + NL + "\t * Tests the '{@link ";
+  protected final String TEXT_148 = "#set";
+  protected final String TEXT_149 = "(";
+  protected final String TEXT_150 = ") <em>";
+  protected final String TEXT_151 = "</em>}' feature setter." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @see ";
+  protected final String TEXT_152 = "#set";
+  protected final String TEXT_153 = "(";
+  protected final String TEXT_154 = ")" + NL + "\t * @generated" + NL + "\t */";
+  protected final String TEXT_155 = NL + "\t@Override";
+  protected final String TEXT_156 = NL + "\tpublic void testSet";
+  protected final String TEXT_157 = "()" + NL + "\t{" + NL + "\t\t// TODO: implement this redefined feature setter test method" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t}";
+  protected final String TEXT_158 = NL + NL + "\t/**" + NL + "\t * Tests the '{@link ";
+  protected final String TEXT_159 = "#unset";
+  protected final String TEXT_160 = "() <em>unset";
+  protected final String TEXT_161 = "()</em>}' method." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @see ";
+  protected final String TEXT_162 = "#unset";
+  protected final String TEXT_163 = "()" + NL + "\t * @generated" + NL + "\t */";
+  protected final String TEXT_164 = NL + "\t@Override";
+  protected final String TEXT_165 = NL + "\tpublic void testUnset";
+  protected final String TEXT_166 = "()" + NL + "\t{" + NL + "\t\t// TODO: implement this redefined test method" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t}";
+  protected final String TEXT_167 = NL + NL + "\t/**" + NL + "\t * Tests the '{@link ";
+  protected final String TEXT_168 = "#isSet";
+  protected final String TEXT_169 = "() <em>isSet";
+  protected final String TEXT_170 = "()</em>}' method." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @see ";
+  protected final String TEXT_171 = "#isSet";
+  protected final String TEXT_172 = "()" + NL + "\t * @generated" + NL + "\t */";
+  protected final String TEXT_173 = NL + "\t@Override";
+  protected final String TEXT_174 = NL + "\tpublic void testIsSet";
+  protected final String TEXT_175 = "()" + NL + "\t{" + NL + "\t\t// TODO: implement this redefined test method" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t}";
+  protected final String TEXT_176 = NL + NL + "\t/**" + NL + "\t * Tests the '{@link ";
+  protected final String TEXT_177 = "#";
+  protected final String TEXT_178 = "(";
+  protected final String TEXT_179 = ") <em>";
+  protected final String TEXT_180 = "</em>}' operation." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @see ";
+  protected final String TEXT_181 = "#";
+  protected final String TEXT_182 = "(";
+  protected final String TEXT_183 = ")" + NL + "\t * @generated" + NL + "\t */";
+  protected final String TEXT_184 = NL + "\t@Override";
+  protected final String TEXT_185 = NL + "\tpublic void test";
+  protected final String TEXT_186 = "()" + NL + "\t{" + NL + "\t\t// TODO: implement this redefined operation test method" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t}";
+  protected final String TEXT_187 = NL + "} //";
+  protected final String TEXT_188 = NL;
 
   public String generate(Object argument)
   {
@@ -359,281 +366,297 @@ public class TestCase
     if (genModel.useClassOverrideAnnotation()) {
     stringBuffer.append(TEXT_60);
     }
+    if (genModel.useGenerics() && genClass.isMapEntry()) {
     stringBuffer.append(TEXT_61);
-    stringBuffer.append(genPackage.getQualifiedEFactoryInternalInstanceAccessor());
+    }
     stringBuffer.append(TEXT_62);
-    stringBuffer.append(genClass.getName());
+    if (genClass.isMapEntry()) {
     stringBuffer.append(TEXT_63);
-    if (genModel.useClassOverrideAnnotation()) {
+    stringBuffer.append(genClass.getImportedInterfaceName());
+    stringBuffer.append(genClass.getInterfaceWildTypeArguments());
     stringBuffer.append(TEXT_64);
-    }
+    stringBuffer.append(genPackage.getQualifiedEFactoryInternalInstanceAccessor());
     stringBuffer.append(TEXT_65);
+    stringBuffer.append(genClass.getQualifiedClassifierAccessor());
+    stringBuffer.append(TEXT_66);
+    } else {
+    stringBuffer.append(TEXT_67);
+    stringBuffer.append(genPackage.getQualifiedEFactoryInternalInstanceAccessor());
+    stringBuffer.append(TEXT_68);
+    stringBuffer.append(genClass.getName());
+    stringBuffer.append(TEXT_69);
+    }
+    stringBuffer.append(TEXT_70);
+    if (genModel.useClassOverrideAnnotation()) {
+    stringBuffer.append(TEXT_71);
+    }
+    stringBuffer.append(TEXT_72);
     }
     for (GenFeature genFeature : genClass.getImplementedGenFeatures()) {
     if (genFeature.isTested()) {
     if (genFeature.isGet() && !genFeature.isSuppressedGetVisibility()) {
-    stringBuffer.append(TEXT_66);
+    stringBuffer.append(TEXT_73);
     stringBuffer.append(genFeature.getGenClass().getQualifiedInterfaceName());
-    stringBuffer.append(TEXT_67);
+    stringBuffer.append(TEXT_74);
     stringBuffer.append(genFeature.getGetAccessor());
-    stringBuffer.append(TEXT_68);
+    stringBuffer.append(TEXT_75);
     stringBuffer.append(genFeature.getFormattedName());
-    stringBuffer.append(TEXT_69);
+    stringBuffer.append(TEXT_76);
     stringBuffer.append(genFeature.getGenClass().getQualifiedInterfaceName());
-    stringBuffer.append(TEXT_70);
+    stringBuffer.append(TEXT_77);
     stringBuffer.append(genFeature.getGetAccessor());
-    stringBuffer.append(TEXT_71);
+    stringBuffer.append(TEXT_78);
     if (genModel.getComplianceLevel().getValue() >= GenJDKLevel.JDK50) { //TestCase/getGenFeature.annotations.insert.javajetinc
     if (genClass.getExtendedGenFeatures().contains(genFeature) || (UML2GenModelUtil.isDuplicate(genFeature) && (!UML2GenModelUtil.isRedefinition(genFeature) || (genClass.getExtendedGenFeatures().contains(UML2GenModelUtil.getRedefinedGenFeatures(genFeature).iterator().next()) && UML2GenModelUtil.isTest(UML2GenModelUtil.getRedefinedGenFeatures(genFeature).iterator().next()))))) {
-    stringBuffer.append(TEXT_72);
+    stringBuffer.append(TEXT_79);
     }
     }
-    stringBuffer.append(TEXT_73);
+    stringBuffer.append(TEXT_80);
     stringBuffer.append(genModel.capName(genFeature.getGetAccessor()));
-    stringBuffer.append(TEXT_74);
-    stringBuffer.append(TEXT_75);
-    stringBuffer.append(TEXT_76);
+    stringBuffer.append(TEXT_81);
+    stringBuffer.append(TEXT_82);
+    stringBuffer.append(TEXT_83);
     //TestCase/getGenFeature.todo.override.javajetinc
-    stringBuffer.append(TEXT_77);
+    stringBuffer.append(TEXT_84);
     //TestCase/getGenFeature.override.javajetinc
     }
     if (genFeature.isSet() && !genFeature.isSuppressedSetVisibility()) {
-    stringBuffer.append(TEXT_78);
+    stringBuffer.append(TEXT_85);
     stringBuffer.append(genFeature.getGenClass().getQualifiedInterfaceName());
-    stringBuffer.append(TEXT_79);
+    stringBuffer.append(TEXT_86);
     stringBuffer.append(genFeature.getAccessorName());
-    stringBuffer.append(TEXT_80);
+    stringBuffer.append(TEXT_87);
     stringBuffer.append(genFeature.getRawBoundType());
-    stringBuffer.append(TEXT_81);
+    stringBuffer.append(TEXT_88);
     stringBuffer.append(genFeature.getFormattedName());
-    stringBuffer.append(TEXT_82);
+    stringBuffer.append(TEXT_89);
     stringBuffer.append(genFeature.getGenClass().getQualifiedInterfaceName());
-    stringBuffer.append(TEXT_83);
+    stringBuffer.append(TEXT_90);
     stringBuffer.append(genFeature.getAccessorName());
-    stringBuffer.append(TEXT_84);
+    stringBuffer.append(TEXT_91);
     stringBuffer.append(genFeature.getRawBoundType());
-    stringBuffer.append(TEXT_85);
+    stringBuffer.append(TEXT_92);
     if (genModel.getComplianceLevel().getValue() >= GenJDKLevel.JDK50) { //TestCase/setGenFeature.annotations.insert.javajetinc
     if (genClass.getExtendedGenFeatures().contains(genFeature) || (UML2GenModelUtil.isDuplicate(genFeature) && (!UML2GenModelUtil.isRedefinition(genFeature) || (genClass.getExtendedGenFeatures().contains(UML2GenModelUtil.getRedefinedGenFeatures(genFeature).iterator().next()) && UML2GenModelUtil.isTest(UML2GenModelUtil.getRedefinedGenFeatures(genFeature).iterator().next()))))) {
-    stringBuffer.append(TEXT_86);
+    stringBuffer.append(TEXT_93);
     }
     }
-    stringBuffer.append(TEXT_87);
+    stringBuffer.append(TEXT_94);
     stringBuffer.append(genFeature.getAccessorName());
-    stringBuffer.append(TEXT_88);
-    stringBuffer.append(TEXT_89);
-    stringBuffer.append(TEXT_90);
+    stringBuffer.append(TEXT_95);
+    stringBuffer.append(TEXT_96);
+    stringBuffer.append(TEXT_97);
     //TestCase/setGenFeature.todo.override.javajetinc
-    stringBuffer.append(TEXT_91);
+    stringBuffer.append(TEXT_98);
     //TestCase/setGenFeature.override.javajetinc
     }
     if (genFeature.isUnset() && !genFeature.isSuppressedUnsetVisibility()) {
-    stringBuffer.append(TEXT_92);
+    stringBuffer.append(TEXT_99);
     stringBuffer.append(genFeature.getGenClass().getQualifiedInterfaceName());
-    stringBuffer.append(TEXT_93);
+    stringBuffer.append(TEXT_100);
     stringBuffer.append(genFeature.getAccessorName());
-    stringBuffer.append(TEXT_94);
+    stringBuffer.append(TEXT_101);
     stringBuffer.append(genFeature.getAccessorName());
-    stringBuffer.append(TEXT_95);
+    stringBuffer.append(TEXT_102);
     stringBuffer.append(genFeature.getGenClass().getQualifiedInterfaceName());
-    stringBuffer.append(TEXT_96);
+    stringBuffer.append(TEXT_103);
     stringBuffer.append(genFeature.getAccessorName());
-    stringBuffer.append(TEXT_97);
+    stringBuffer.append(TEXT_104);
     if (genModel.getComplianceLevel().getValue() >= GenJDKLevel.JDK50) { //TestCase/unsetGenFeature.annotations.insert.javajetinc
     if (genClass.getExtendedGenFeatures().contains(genFeature) || (UML2GenModelUtil.isDuplicate(genFeature) && (!UML2GenModelUtil.isRedefinition(genFeature) || (genClass.getExtendedGenFeatures().contains(UML2GenModelUtil.getRedefinedGenFeatures(genFeature).iterator().next()) && UML2GenModelUtil.isTest(UML2GenModelUtil.getRedefinedGenFeatures(genFeature).iterator().next()))))) {
-    stringBuffer.append(TEXT_98);
+    stringBuffer.append(TEXT_105);
     }
     }
-    stringBuffer.append(TEXT_99);
+    stringBuffer.append(TEXT_106);
     stringBuffer.append(genFeature.getAccessorName());
-    stringBuffer.append(TEXT_100);
-    stringBuffer.append(TEXT_101);
-    stringBuffer.append(TEXT_102);
+    stringBuffer.append(TEXT_107);
+    stringBuffer.append(TEXT_108);
+    stringBuffer.append(TEXT_109);
     //TestCase/unsetGenFeature.todo.override.javajetinc
-    stringBuffer.append(TEXT_103);
+    stringBuffer.append(TEXT_110);
     //TestCase/unsetGenFeature.override.javajetinc
     }
     if (genFeature.isIsSet() && !genFeature.isSuppressedIsSetVisibility()) {
-    stringBuffer.append(TEXT_104);
+    stringBuffer.append(TEXT_111);
     stringBuffer.append(genFeature.getGenClass().getQualifiedInterfaceName());
-    stringBuffer.append(TEXT_105);
+    stringBuffer.append(TEXT_112);
     stringBuffer.append(genFeature.getAccessorName());
-    stringBuffer.append(TEXT_106);
+    stringBuffer.append(TEXT_113);
     stringBuffer.append(genFeature.getAccessorName());
-    stringBuffer.append(TEXT_107);
+    stringBuffer.append(TEXT_114);
     stringBuffer.append(genFeature.getGenClass().getQualifiedInterfaceName());
-    stringBuffer.append(TEXT_108);
+    stringBuffer.append(TEXT_115);
     stringBuffer.append(genFeature.getAccessorName());
-    stringBuffer.append(TEXT_109);
+    stringBuffer.append(TEXT_116);
     if (genModel.getComplianceLevel().getValue() >= GenJDKLevel.JDK50) { //TestCase/isSetGenFeature.annotations.insert.javajetinc
     if (genClass.getExtendedGenFeatures().contains(genFeature) || (UML2GenModelUtil.isDuplicate(genFeature) && (!UML2GenModelUtil.isRedefinition(genFeature) || (genClass.getExtendedGenFeatures().contains(UML2GenModelUtil.getRedefinedGenFeatures(genFeature).iterator().next()) && UML2GenModelUtil.isTest(UML2GenModelUtil.getRedefinedGenFeatures(genFeature).iterator().next()))))) {
-    stringBuffer.append(TEXT_110);
+    stringBuffer.append(TEXT_117);
     }
     }
-    stringBuffer.append(TEXT_111);
+    stringBuffer.append(TEXT_118);
     stringBuffer.append(genFeature.getAccessorName());
-    stringBuffer.append(TEXT_112);
-    stringBuffer.append(TEXT_113);
-    stringBuffer.append(TEXT_114);
+    stringBuffer.append(TEXT_119);
+    stringBuffer.append(TEXT_120);
+    stringBuffer.append(TEXT_121);
     //TestCase/isSetGenFeature.todo.override.javajetinc
-    stringBuffer.append(TEXT_115);
+    stringBuffer.append(TEXT_122);
     //TestCase/isSetGenFeature.override.javajetinc
     }
     }
     //TestCase/implementedGenFeature.override.javajetinc
     }
     for (GenOperation genOperation : genClass.getImplementedGenOperations()) {
-    stringBuffer.append(TEXT_116);
+    stringBuffer.append(TEXT_123);
     stringBuffer.append(genOperation.getGenClass().getQualifiedInterfaceName());
-    stringBuffer.append(TEXT_117);
+    stringBuffer.append(TEXT_124);
     stringBuffer.append(genOperation.getName());
-    stringBuffer.append(TEXT_118);
+    stringBuffer.append(TEXT_125);
     stringBuffer.append(genOperation.getParameterTypes(", "));
-    stringBuffer.append(TEXT_119);
+    stringBuffer.append(TEXT_126);
     stringBuffer.append(genOperation.getFormattedName());
-    stringBuffer.append(TEXT_120);
+    stringBuffer.append(TEXT_127);
     stringBuffer.append(genOperation.getGenClass().getQualifiedInterfaceName());
-    stringBuffer.append(TEXT_121);
+    stringBuffer.append(TEXT_128);
     stringBuffer.append(genOperation.getName());
-    stringBuffer.append(TEXT_122);
+    stringBuffer.append(TEXT_129);
     stringBuffer.append(genOperation.getParameterTypes(", "));
-    stringBuffer.append(TEXT_123);
+    stringBuffer.append(TEXT_130);
     if (genModel.getComplianceLevel().getValue() >= GenJDKLevel.JDK50) { //TestCase/genOperation.annotations.insert.javajetinc
     if (genClass.getExtendedGenOperations().contains(genOperation) || (UML2GenModelUtil.isDuplicate(genOperation) && (!UML2GenModelUtil.isRedefinition(genOperation) || genClass.getExtendedGenOperations().contains(UML2GenModelUtil.getRedefinedGenOperations(genOperation).iterator().next())))) {
-    stringBuffer.append(TEXT_124);
+    stringBuffer.append(TEXT_131);
     }
     }
-    stringBuffer.append(TEXT_125);
+    stringBuffer.append(TEXT_132);
     stringBuffer.append(genModel.capName(genOperation.getName()));
     stringBuffer.append(genOperation.getGenParameters().size() == 0 ? "" : "__" + genOperation.getParameterTypes("_", false));
-    stringBuffer.append(TEXT_126);
-    stringBuffer.append(TEXT_127);
-    stringBuffer.append(TEXT_128);
+    stringBuffer.append(TEXT_133);
+    stringBuffer.append(TEXT_134);
+    stringBuffer.append(TEXT_135);
     //TestCase/implementedGenOperation.todo.override.javajetinc
-    stringBuffer.append(TEXT_129);
+    stringBuffer.append(TEXT_136);
     //TestCase/implementedGenOperation.override.javajetinc
     }
-    stringBuffer.append(TEXT_130);
+    stringBuffer.append(TEXT_137);
     for (GenFeature genFeature : UML2GenModelUtil.getImplementedRedefinedGenFeatures(genClass)) {
     if (genFeature.isGet() && !genFeature.isSuppressedGetVisibility()) {
-    stringBuffer.append(TEXT_131);
+    stringBuffer.append(TEXT_138);
     stringBuffer.append(genFeature.getGenClass().getQualifiedInterfaceName());
-    stringBuffer.append(TEXT_132);
+    stringBuffer.append(TEXT_139);
     stringBuffer.append(genFeature.getGetAccessor());
-    stringBuffer.append(TEXT_133);
+    stringBuffer.append(TEXT_140);
     stringBuffer.append(genFeature.getFormattedName());
-    stringBuffer.append(TEXT_134);
+    stringBuffer.append(TEXT_141);
     stringBuffer.append(genFeature.getGenClass().getQualifiedInterfaceName());
-    stringBuffer.append(TEXT_135);
+    stringBuffer.append(TEXT_142);
     stringBuffer.append(genFeature.getGetAccessor());
-    stringBuffer.append(TEXT_136);
+    stringBuffer.append(TEXT_143);
     if (genModel.getComplianceLevel().getValue() >= GenJDKLevel.JDK50 && UML2GenModelUtil.isTest(genFeature)) { //getGenFeature.annotations.insert.javajetinc
     if (genClass.getExtendedGenFeatures().contains(genFeature) || (UML2GenModelUtil.isDuplicate(genFeature) && (!UML2GenModelUtil.isRedefinition(genFeature) || (genClass.getExtendedGenFeatures().contains(UML2GenModelUtil.getRedefinedGenFeatures(genFeature).iterator().next()) && UML2GenModelUtil.isTest(UML2GenModelUtil.getRedefinedGenFeatures(genFeature).iterator().next()))))) {
-    stringBuffer.append(TEXT_137);
+    stringBuffer.append(TEXT_144);
     }
     }
-    stringBuffer.append(TEXT_138);
+    stringBuffer.append(TEXT_145);
     stringBuffer.append(genModel.capName(genFeature.getGetAccessor()));
-    stringBuffer.append(TEXT_139);
+    stringBuffer.append(TEXT_146);
     }
     if (genFeature.isSet() && !genFeature.isSuppressedSetVisibility()) {
-    stringBuffer.append(TEXT_140);
+    stringBuffer.append(TEXT_147);
     stringBuffer.append(genFeature.getGenClass().getQualifiedInterfaceName());
-    stringBuffer.append(TEXT_141);
+    stringBuffer.append(TEXT_148);
     stringBuffer.append(genFeature.getAccessorName());
-    stringBuffer.append(TEXT_142);
+    stringBuffer.append(TEXT_149);
     stringBuffer.append(genFeature.getRawBoundType());
-    stringBuffer.append(TEXT_143);
+    stringBuffer.append(TEXT_150);
     stringBuffer.append(genFeature.getFormattedName());
-    stringBuffer.append(TEXT_144);
+    stringBuffer.append(TEXT_151);
     stringBuffer.append(genFeature.getGenClass().getQualifiedInterfaceName());
-    stringBuffer.append(TEXT_145);
+    stringBuffer.append(TEXT_152);
     stringBuffer.append(genFeature.getAccessorName());
-    stringBuffer.append(TEXT_146);
+    stringBuffer.append(TEXT_153);
     stringBuffer.append(genFeature.getRawBoundType());
-    stringBuffer.append(TEXT_147);
+    stringBuffer.append(TEXT_154);
     if (genModel.getComplianceLevel().getValue() >= GenJDKLevel.JDK50 && UML2GenModelUtil.isTest(genFeature)) { //setGenFeature.annotations.insert.javajetinc
     if (genClass.getExtendedGenFeatures().contains(genFeature) || (UML2GenModelUtil.isDuplicate(genFeature) && (!UML2GenModelUtil.isRedefinition(genFeature) || (genClass.getExtendedGenFeatures().contains(UML2GenModelUtil.getRedefinedGenFeatures(genFeature).iterator().next()) && UML2GenModelUtil.isTest(UML2GenModelUtil.getRedefinedGenFeatures(genFeature).iterator().next()))))) {
-    stringBuffer.append(TEXT_148);
+    stringBuffer.append(TEXT_155);
     }
     }
-    stringBuffer.append(TEXT_149);
+    stringBuffer.append(TEXT_156);
     stringBuffer.append(genFeature.getAccessorName());
-    stringBuffer.append(TEXT_150);
+    stringBuffer.append(TEXT_157);
     }
     if (genFeature.isUnset() && !genFeature.isSuppressedUnsetVisibility()) {
-    stringBuffer.append(TEXT_151);
+    stringBuffer.append(TEXT_158);
     stringBuffer.append(genFeature.getGenClass().getQualifiedInterfaceName());
-    stringBuffer.append(TEXT_152);
+    stringBuffer.append(TEXT_159);
     stringBuffer.append(genFeature.getAccessorName());
-    stringBuffer.append(TEXT_153);
+    stringBuffer.append(TEXT_160);
     stringBuffer.append(genFeature.getAccessorName());
-    stringBuffer.append(TEXT_154);
+    stringBuffer.append(TEXT_161);
     stringBuffer.append(genFeature.getGenClass().getQualifiedInterfaceName());
-    stringBuffer.append(TEXT_155);
+    stringBuffer.append(TEXT_162);
     stringBuffer.append(genFeature.getAccessorName());
-    stringBuffer.append(TEXT_156);
+    stringBuffer.append(TEXT_163);
     if (genModel.getComplianceLevel().getValue() >= GenJDKLevel.JDK50 && UML2GenModelUtil.isTest(genFeature)) { //unsetGenFeature.annotations.insert.javajetinc
     if (genClass.getExtendedGenFeatures().contains(genFeature) || (UML2GenModelUtil.isDuplicate(genFeature) && (!UML2GenModelUtil.isRedefinition(genFeature) || (genClass.getExtendedGenFeatures().contains(UML2GenModelUtil.getRedefinedGenFeatures(genFeature).iterator().next()) && UML2GenModelUtil.isTest(UML2GenModelUtil.getRedefinedGenFeatures(genFeature).iterator().next()))))) {
-    stringBuffer.append(TEXT_157);
+    stringBuffer.append(TEXT_164);
     }
     }
-    stringBuffer.append(TEXT_158);
+    stringBuffer.append(TEXT_165);
     stringBuffer.append(genFeature.getAccessorName());
-    stringBuffer.append(TEXT_159);
+    stringBuffer.append(TEXT_166);
     }
     if (genFeature.isIsSet() && !genFeature.isSuppressedIsSetVisibility()) {
-    stringBuffer.append(TEXT_160);
+    stringBuffer.append(TEXT_167);
     stringBuffer.append(genFeature.getGenClass().getQualifiedInterfaceName());
-    stringBuffer.append(TEXT_161);
+    stringBuffer.append(TEXT_168);
     stringBuffer.append(genFeature.getAccessorName());
-    stringBuffer.append(TEXT_162);
+    stringBuffer.append(TEXT_169);
     stringBuffer.append(genFeature.getAccessorName());
-    stringBuffer.append(TEXT_163);
+    stringBuffer.append(TEXT_170);
     stringBuffer.append(genFeature.getGenClass().getQualifiedInterfaceName());
-    stringBuffer.append(TEXT_164);
+    stringBuffer.append(TEXT_171);
     stringBuffer.append(genFeature.getAccessorName());
-    stringBuffer.append(TEXT_165);
+    stringBuffer.append(TEXT_172);
     if (genModel.getComplianceLevel().getValue() >= GenJDKLevel.JDK50 && UML2GenModelUtil.isTest(genFeature)) { //isSetGenFeature.annotations.insert.javajetinc
     if (genClass.getExtendedGenFeatures().contains(genFeature) || (UML2GenModelUtil.isDuplicate(genFeature) && (!UML2GenModelUtil.isRedefinition(genFeature) || (genClass.getExtendedGenFeatures().contains(UML2GenModelUtil.getRedefinedGenFeatures(genFeature).iterator().next()) && UML2GenModelUtil.isTest(UML2GenModelUtil.getRedefinedGenFeatures(genFeature).iterator().next()))))) {
-    stringBuffer.append(TEXT_166);
+    stringBuffer.append(TEXT_173);
     }
     }
-    stringBuffer.append(TEXT_167);
+    stringBuffer.append(TEXT_174);
     stringBuffer.append(genFeature.getAccessorName());
-    stringBuffer.append(TEXT_168);
+    stringBuffer.append(TEXT_175);
     }
     }
     for (GenOperation genOperation : UML2GenModelUtil.getImplementedRedefinedGenOperations(genClass)) {
-    stringBuffer.append(TEXT_169);
+    stringBuffer.append(TEXT_176);
     stringBuffer.append(genOperation.getGenClass().getQualifiedInterfaceName());
-    stringBuffer.append(TEXT_170);
+    stringBuffer.append(TEXT_177);
     stringBuffer.append(genOperation.getName());
-    stringBuffer.append(TEXT_171);
+    stringBuffer.append(TEXT_178);
     stringBuffer.append(genOperation.getParameterTypes(", "));
-    stringBuffer.append(TEXT_172);
+    stringBuffer.append(TEXT_179);
     stringBuffer.append(genOperation.getFormattedName());
-    stringBuffer.append(TEXT_173);
+    stringBuffer.append(TEXT_180);
     stringBuffer.append(genOperation.getGenClass().getQualifiedInterfaceName());
-    stringBuffer.append(TEXT_174);
+    stringBuffer.append(TEXT_181);
     stringBuffer.append(genOperation.getName());
-    stringBuffer.append(TEXT_175);
+    stringBuffer.append(TEXT_182);
     stringBuffer.append(genOperation.getParameterTypes(", "));
-    stringBuffer.append(TEXT_176);
+    stringBuffer.append(TEXT_183);
     if (genModel.getComplianceLevel().getValue() >= GenJDKLevel.JDK50) { //genOperation.annotations.insert.javajetinc
     if (genClass.getExtendedGenOperations().contains(genOperation) || (UML2GenModelUtil.isDuplicate(genOperation) && (!UML2GenModelUtil.isRedefinition(genOperation) || genClass.getExtendedGenOperations().contains(UML2GenModelUtil.getRedefinedGenOperations(genOperation).iterator().next())))) {
-    stringBuffer.append(TEXT_177);
+    stringBuffer.append(TEXT_184);
     }
     }
-    stringBuffer.append(TEXT_178);
+    stringBuffer.append(TEXT_185);
     stringBuffer.append(genModel.capName(genOperation.getName()));
     stringBuffer.append(genOperation.getGenParameters().size() == 0 ? "" : "__" + genOperation.getParameterTypes("_", false));
-    stringBuffer.append(TEXT_179);
+    stringBuffer.append(TEXT_186);
     }
-    stringBuffer.append(TEXT_180);
+    stringBuffer.append(TEXT_187);
     stringBuffer.append(genClass.getTestCaseClassName());
     genModel.emitSortedImports();
-    stringBuffer.append(TEXT_181);
+    stringBuffer.append(TEXT_188);
     return stringBuffer.toString();
   }
 }