[247980] Maintain Release Currency with EMF 2.5 and Eclipse 3.5
diff --git a/plugins/org.eclipse.uml2.codegen.ecore/src/org/eclipse/uml2/codegen/ecore/templates/model/Class.java b/plugins/org.eclipse.uml2.codegen.ecore/src/org/eclipse/uml2/codegen/ecore/templates/model/Class.java
index 8436c7d..a612e8e 100644
--- a/plugins/org.eclipse.uml2.codegen.ecore/src/org/eclipse/uml2/codegen/ecore/templates/model/Class.java
+++ b/plugins/org.eclipse.uml2.codegen.ecore/src/org/eclipse/uml2/codegen/ecore/templates/model/Class.java
@@ -3577,7 +3577,7 @@
stringBuffer.append(genClass.getQualifiedClassifierAccessor());
stringBuffer.append(TEXT_174);
}
- if (isImplementation && (genModel.getFeatureDelegation() == GenDelegationKind.REFLECTIVE_LITERAL || genModel.isDynamicDelegation()) && (genClass.getClassExtendsGenClass() == null || (genClass.getClassExtendsGenClass().getGenModel().getFeatureDelegation() != GenDelegationKind.REFLECTIVE_LITERAL && genClass.getClassExtendsGenClass().getGenModel().isDynamicDelegation()))) {
+ if (isImplementation && (genModel.getFeatureDelegation() == GenDelegationKind.REFLECTIVE_LITERAL || genModel.isDynamicDelegation()) && (genClass.getClassExtendsGenClass() == null || (genClass.getClassExtendsGenClass().getGenModel().getFeatureDelegation() != GenDelegationKind.REFLECTIVE_LITERAL && !genClass.getClassExtendsGenClass().getGenModel().isDynamicDelegation()))) {
stringBuffer.append(TEXT_175);
if (genModel.useClassOverrideAnnotation()) {
stringBuffer.append(TEXT_176);
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 f26918c..7795ee0 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
@@ -55,7 +55,7 @@
protected final String TEXT_37 = " fixture = null;";
protected final String TEXT_38 = NL + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic static void main(String[] args)" + NL + "\t{" + NL + "\t\t";
protected final String TEXT_39 = ".run(";
- protected final String TEXT_40 = "Test.class);" + NL + "\t}";
+ protected final String TEXT_40 = ".class);" + NL + "\t}";
protected final String TEXT_41 = NL + NL + "\t/**" + NL + "\t * Constructs a new ";
protected final String TEXT_42 = " test case with the given name." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
protected final String TEXT_43 = "(String name)" + NL + "\t{" + NL + "\t\tsuper(name);" + NL + "\t}";
@@ -320,7 +320,7 @@
stringBuffer.append(TEXT_38);
stringBuffer.append(genModel.getImportedName("junit.textui.TestRunner"));
stringBuffer.append(TEXT_39);
- stringBuffer.append(genClass.getInterfaceName());
+ stringBuffer.append(genClass.getTestCaseClassName());
stringBuffer.append(TEXT_40);
}
stringBuffer.append(TEXT_41);
