commit 50d60fc05c932815fffa0c33131b6d329b315c12
author khussey <khussey> Tue May 20 15:24:33 2008 +0000
committer khussey <khussey> Tue May 20 15:24:33 2008 +0000
tree 7360835eda9680c6e9656d17fab344c8b7d9b081
parent 73ce062ac37e3794bfe126e12c97cfe31527ce90

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

plugins/org.eclipse.uml2.codegen.ecore/src/org/eclipse/uml2/codegen/ecore/templates/model/Class.java

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 e8cf79a..d31a664 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
@@ -8388,7 +8388,7 @@
     }
     }
     }
-    if (isImplementation && !genModel.isReflectiveDelegation() && !genClass.getToStringGenFeatures().isEmpty()) {
+    if (!genClass.hasImplementedToStringGenOperation() && isImplementation && !genModel.isReflectiveDelegation() && !genClass.getToStringGenFeatures().isEmpty()) {
     stringBuffer.append(TEXT_2283);
     if (genModel.useClassOverrideAnnotation()) {
     stringBuffer.append(TEXT_2284);