Attachment 142717 Details for Bug 284810 – Patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Patch

org.eclipse.uml2.codegen.ecore.patch (text/plain), 2.40 KB, created by John T.E. Timm

on 2009-07-27 19:42:11 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: John T.E. Timm

Created: 2009-07-27 19:42:11 EDT

Size: 2.40 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.uml2.codegen.ecore
>Index: templates/model/OperationsClass.javajet
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.codegen.ecore/templates/model/OperationsClass.javajet,v
>retrieving revision 1.13
>diff -u -r1.13 OperationsClass.javajet
>--- templates/model/OperationsClass.javajet	9 Dec 2008 20:08:55 -0000	1.13
>+++ templates/model/OperationsClass.javajet	27 Jul 2009 23:32:22 -0000
>@@ -56,7 +56,7 @@
> 	public static final <%=genModel.getImportedName("java.lang.String")%> copyright = <%=genModel.getCopyrightFieldLiteral()%>;<%=genModel.getNonNLS()%>
> 
> <%}%>
>-<%if (UML2GenModelUtil.hasOCLOperationBodies(genClass) && !UML2GenModelUtil.hasOCLOperationBodies(genClass.getClassExtendsGenClass())) {%>
>+<%if (UML2GenModelUtil.hasOCLOperationBodies(genClass) && (!UML2GenModelUtil.hasOCLOperationBodies(genClass.getClassExtendsGenClass()) || (UML2GenModelUtil.hasOCLOperationBodies(genClass.getClassExtendsGenClass()) && !UML2GenModelUtil.isOperationsClasses(genClass.getClassExtendsGenClass().getGenPackage())))) {%>
> 	/**
> 	 * The cached environment for evaluating OCL expressions.
> 	 * 
>Index: templates/model/Class/insert.javajetinc
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.codegen.ecore/templates/model/Class/insert.javajetinc,v
>retrieving revision 1.32
>diff -u -r1.32 insert.javajetinc
>--- templates/model/Class/insert.javajetinc	7 Jan 2009 13:32:56 -0000	1.32
>+++ templates/model/Class/insert.javajetinc	27 Jul 2009 23:32:22 -0000
>@@ -1,5 +1,5 @@
> <%if (isImplementation) {%>
>-  <%if (!UML2GenModelUtil.isOperationsClasses(genPackage) && UML2GenModelUtil.hasOCLOperationBodies(genClass) && !UML2GenModelUtil.hasOCLOperationBodies(genClass.getClassExtendsGenClass())) {%>
>+  <%if (!UML2GenModelUtil.isOperationsClasses(genPackage) && UML2GenModelUtil.hasOCLOperationBodies(genClass) && (!UML2GenModelUtil.hasOCLOperationBodies(genClass.getClassExtendsGenClass()) || (UML2GenModelUtil.hasOCLOperationBodies(genClass.getClassExtendsGenClass()) && UML2GenModelUtil.isOperationsClasses(genClass.getClassExtendsGenClass().getGenPackage())))) {%>
> 	/**
> 	 * The cached environment for evaluating OCL expressions.
> 	 *

Flags:

Kenn.Hussey: iplog+

Actions: View

Attachments on bug 284810: 142717