Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 211270
Collapse All | Expand All

(-)src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenClassImpl.java (-2 / +9 lines)
Lines 2902-2910 Link Here
2902
      else if ((genOperation.getName().startsWith("get") || genOperation.getName().startsWith("is"))
2902
      else if ((genOperation.getName().startsWith("get") || genOperation.getName().startsWith("is"))
2903
        && genOperation.getGenParameters().isEmpty())
2903
        && genOperation.getGenParameters().isEmpty())
2904
      {
2904
      {
2905
        String operationType = genOperation.getType(GenClassImpl.this);
2905
        for (GenFeature genFeature : allGenFeatures)
2906
        for (GenFeature genFeature : allGenFeatures)
2906
        {
2907
        {
2907
          if (genFeature.getGetAccessor().equals(genOperation.getName()))
2908
          if (genFeature.getGetAccessor().equals(genOperation.getName()) &&
2909
                genFeature.getType(GenClassImpl.this).equals(operationType))
2908
          {
2910
          {
2909
            return false;
2911
            return false;
2910
          }
2912
          }
Lines 2936-2946 Link Here
2936
2938
2937
      if (!genOperation.hasBody())
2939
      if (!genOperation.hasBody())
2938
      {
2940
      {
2941
        String operationType = genOperation.getType(GenClassImpl.this);
2939
        for (GenOperation baseOperation : extendsGenClassOperations)
2942
        for (GenOperation baseOperation : extendsGenClassOperations)
2940
        {
2943
        {
2941
          if (baseOperation.isOverrideOf(GenClassImpl.this, genOperation))
2944
          if (baseOperation.isOverrideOf(GenClassImpl.this, genOperation))
2942
          {
2945
          {
2943
            return false;
2946
            String baseOperationType = baseOperation.getType(GenClassImpl.this);
2947
            if (operationType== null ? baseOperationType == null : operationType.equals(baseOperationType))
2948
            {
2949
              return false;
2950
            }
2944
          }
2951
          }
2945
        }
2952
        }
2946
      }
2953
      }

Return to bug 211270