Attachment 85838 Details for Bug 211270 – I'll mark it as a patch this type.

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

[patch] I'll mark it as a patch this type.

211270.patch (text/plain), 1.86 KB, created by Ed Merks

on 2007-12-26 07:58:16 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Ed Merks

Created: 2007-12-26 07:58:16 EST

Size: 1.86 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.emf.codegen.ecore
>Index: src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenClassImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenClassImpl.java,v
>retrieving revision 1.81
>diff -u -r1.81 GenClassImpl.java
>--- src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenClassImpl.java	12 Jun 2007 20:56:34 -0000	1.81
>+++ src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenClassImpl.java	25 Dec 2007 14:44:20 -0000
>@@ -2902,9 +2902,11 @@
>       else if ((genOperation.getName().startsWith("get") || genOperation.getName().startsWith("is"))
>         && genOperation.getGenParameters().isEmpty())
>       {
>+        String operationType = genOperation.getType(GenClassImpl.this);
>         for (GenFeature genFeature : allGenFeatures)
>         {
>-          if (genFeature.getGetAccessor().equals(genOperation.getName()))
>+          if (genFeature.getGetAccessor().equals(genOperation.getName()) &&
>+                genFeature.getType(GenClassImpl.this).equals(operationType))
>           {
>             return false;
>           }
>@@ -2936,11 +2938,16 @@
> 
>       if (!genOperation.hasBody())
>       {
>+        String operationType = genOperation.getType(GenClassImpl.this);
>         for (GenOperation baseOperation : extendsGenClassOperations)
>         {
>           if (baseOperation.isOverrideOf(GenClassImpl.this, genOperation))
>           {
>-            return false;
>+            String baseOperationType = baseOperation.getType(GenClassImpl.this);
>+            if (operationType== null ? baseOperationType == null : operationType.equals(baseOperationType))
>+            {
>+              return false;
>+            }
>           }
>         }
>       }

Actions: View | Diff

Attachments on bug 211270: 83991 | 83992 | 85836 | 85838