diff options
author | khussey | 2011-09-09 02:51:27 +0000 |
---|---|---|
committer | Matt Ward | 2012-05-16 19:14:31 +0000 |
commit | c927a49e9503804df8463982faff42b3adb77264 (patch) | |
tree | 65caf728a985fb25c496fd967b52c8b645e3f439 | |
parent | f351b3bbbe2066bf0dc01e1cfc04c16bd7f45af8 (diff) | |
download | org.eclipse.uml2.test-R3_2_maintenance.tar.gz org.eclipse.uml2.test-R3_2_maintenance.tar.xz org.eclipse.uml2.test-R3_2_maintenance.zip |
[357097] Fixing a typo in a class template override.R3_2_maintenance
3 files changed, 6 insertions, 2 deletions
diff --git a/plugins/org.eclipse.uml2.codegen.ecore/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.codegen.ecore/META-INF/MANIFEST.MF index db785524..e172883d 100644 --- a/plugins/org.eclipse.uml2.codegen.ecore/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.uml2.codegen.ecore/META-INF/MANIFEST.MF @@ -2,7 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.uml2.codegen.ecore; singleton:=true +<<<<<<< HEAD Bundle-Version: 1.7.0.qualifier +======= +Bundle-Version: 1.7.1.qualifier +>>>>>>> [357097] Fixing a typo in a class template override. Bundle-ClassPath: . Bundle-Activator: org.eclipse.uml2.codegen.ecore.CodeGenEcorePlugin$Implementation Bundle-Vendor: %providerName 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 33e87b5e..a1d11212 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 @@ -2374,7 +2374,7 @@ public class Class protected final String TEXT_2355 = NL + "\t\t\t\treturn isSet"; protected final String TEXT_2356 = "();"; protected final String TEXT_2357 = NL + "\t\t\t\treturn "; - protected final String TEXT_2358 = "_ESETTING_DELEGATE.dynamicIsSet(this, null, 0);"; + protected final String TEXT_2358 = "__ESETTING_DELEGATE.dynamicIsSet(this, null, 0);"; protected final String TEXT_2359 = NL + "\t\t\t\treturn !(("; protected final String TEXT_2360 = ".Internal.Wrapper)"; protected final String TEXT_2361 = "()).featureMap().isEmpty();"; diff --git a/plugins/org.eclipse.uml2.codegen.ecore/templates/model/Class/eIsSet.override.javajetinc b/plugins/org.eclipse.uml2.codegen.ecore/templates/model/Class/eIsSet.override.javajetinc index e3bedc23..c10b5601 100644 --- a/plugins/org.eclipse.uml2.codegen.ecore/templates/model/Class/eIsSet.override.javajetinc +++ b/plugins/org.eclipse.uml2.codegen.ecore/templates/model/Class/eIsSet.override.javajetinc @@ -26,7 +26,7 @@ <%if (genFeature.isUnsettable()) {%> return isSet<%=genFeature.getAccessorName()%>(); <%} else {%> - return <%=genFeature.getUpperName()%>_ESETTING_DELEGATE.dynamicIsSet(this, null, 0); + return <%=genFeature.getUpperName()%>__ESETTING_DELEGATE.dynamicIsSet(this, null, 0); <%}%> <%} else if (genFeature.isListType() && !genFeature.isUnsettable()) {%> <%if (genFeature.isWrappedFeatureMapType()) {%> |