Attachment 153185 Details for Bug 296004 – Alternative fix

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

[patch] Alternative fix

296004.patch (text/plain), 16.90 KB, created by Dave Steinberg

on 2009-11-26 11:57:47 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Steinberg

Created: 2009-11-26 11:57:47 EST

Size: 16.90 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.emf.codegen.ecore
>Index: templates/model/Class.javajet
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.codegen.ecore/templates/model/Class.javajet,v
>retrieving revision 1.88
>diff -u -r1.88 Class.javajet
>--- templates/model/Class.javajet	16 Nov 2009 21:23:54 -0000	1.88
>+++ templates/model/Class.javajet	26 Nov 2009 17:00:27 -0000
>@@ -335,7 +335,7 @@
> 	private static final int <%=genClass.getOffsetCorrectionField(null)%> = <%=genClass.getQualifiedClassifierAccessor()%>.getFeatureID(<%=genClass.getImplementedGenFeatures().get(0).getQualifiedFeatureAccessor()%>) - <%=genClass.getQualifiedFeatureID(genClass.getImplementedGenFeatures().get(0))%>;
> 
> <%}%>
>-<%if (isImplementation && genClass.hasOffsetCorrection() && !genModel.isReflectiveDelegation()) {%>
>+<%if (isImplementation && !genModel.isReflectiveDelegation()) {%>
>   <%for (GenFeature genFeature : genClass.getImplementedGenFeatures()) { GenFeature reverseFeature = genFeature.getReverse();%>
>     <%if (reverseFeature != null && reverseFeature.getGenClass().hasOffsetCorrection()) {%>
> 	/**
>@@ -630,14 +630,14 @@
> 				<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%> new<%=genFeature.getCapName()%> = (<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>;
>           <%if (!genFeature.isBidirectional()) {%>
> 				<%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> msgs = old<%=genFeature.getCapName()%>.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - <%=genClass.getQualifiedFeatureID(genFeature)%><%=negativeOffsetCorrection%>, null, null);
>-          <%} else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(reverseFeature) : "";%>
>+          <%} else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(genFeature) : "";%>
> 				<%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> msgs =  old<%=genFeature.getCapName()%>.eInverseRemove(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%><%=reverseOffsetCorrection%>, <%=targetClass.getRawImportedInterfaceName()%>.class, null);
>           <%}%>
> 				if (new<%=genFeature.getCapName()%>.eInternalContainer() == null)
> 				{
>           <%if (!genFeature.isBidirectional()) {%>
> 					msgs = new<%=genFeature.getCapName()%>.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - <%=genClass.getQualifiedFeatureID(genFeature)%><%=negativeOffsetCorrection%>, null, msgs);
>-          <%} else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(reverseFeature) : "";%>
>+          <%} else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(genFeature) : "";%>
> 					msgs =  new<%=genFeature.getCapName()%>.eInverseAdd(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%><%=reverseOffsetCorrection%>, <%=targetClass.getRawImportedInterfaceName()%>.class, msgs);
>           <%}%>
> 				}
>@@ -888,7 +888,7 @@
>     <%} else if (genFeature.hasSettingDelegate()) {%>
> 		<%=genFeature.getUpperName()%>__ESETTING_DELEGATE.dynamicSet(this, null, 0, <%if (!isJDK50 && genFeature.isPrimitiveType()) {%>new <%=genFeature.getObjectType(genClass)%>(<%}%>new<%=genFeature.getCapName()%><%if (!isJDK50 && genFeature.isPrimitiveType()) {%>)<%}%>);
>     <%} else if (!genFeature.isVolatile()) {%>
>-      <%if (genFeature.isContainer()) { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(reverseFeature) : "";%>
>+      <%if (genFeature.isContainer()) { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(genFeature) : "";%>
> 		if (new<%=genFeature.getCapName()%> != eInternalContainer() || (eContainerFeatureID() != <%=genClass.getQualifiedFeatureID(genFeature)%><%=positiveOffsetCorrection%> && new<%=genFeature.getCapName()%> != null))
> 		{
> 			if (<%=genModel.getImportedName("org.eclipse.emf.ecore.util.EcoreUtil")%>.isAncestor(this, <%=genFeature.getEObjectCast()%>new<%=genFeature.getCapName()%>))
>@@ -917,7 +917,7 @@
> 				msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - <%=genClass.getQualifiedFeatureID(genFeature)%><%=negativeOffsetCorrection%>, null, msgs);
> 			if (new<%=genFeature.getCapName()%> != null)
> 				msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)new<%=genFeature.getCapName()%>).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - <%=genClass.getQualifiedFeatureID(genFeature)%><%=negativeOffsetCorrection%>, null, msgs);
>-        <%} else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(reverseFeature) : "";%>
>+        <%} else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(genFeature) : "";%>
> 				msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>).eInverseRemove(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%><%=reverseOffsetCorrection%>, <%=targetClass.getRawImportedInterfaceName()%>.class, msgs);
> 			if (new<%=genFeature.getCapName()%> != null)
> 				msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)new<%=genFeature.getCapName()%>).eInverseAdd(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%><%=reverseOffsetCorrection%>, <%=targetClass.getRawImportedInterfaceName()%>.class, msgs);
>@@ -1157,7 +1157,7 @@
> 			<%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> msgs = null;
>         <%if (!genFeature.isBidirectional()) {%>
> 			msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - <%=genClass.getQualifiedFeatureID(genFeature)%><%=negativeOffsetCorrection%>, null, msgs);
>-        <%} else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(reverseFeature) : "";%>
>+        <%} else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(genFeature) : "";%>
> 			msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>).eInverseRemove(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%><%=reverseOffsetCorrection%>, <%=targetClass.getRawImportedInterfaceName()%>.class, msgs);
>         <%}%>
> 			msgs = basicUnset<%=genFeature.getAccessorName()%>(msgs);
>@@ -1536,7 +1536,7 @@
> 				if (<%=genFeature.getSafeName()%> != null)
>     <%if (genFeature.isEffectiveContains()) {%>
> 					msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - <%=genClass.getQualifiedFeatureID(genFeature)%><%=negativeOffsetCorrection%>, null, msgs);
>-    <%} else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(reverseFeature) : "";%>
>+    <%} else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(genFeature) : "";%>
> 					msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>).eInverseRemove(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%><%=reverseOffsetCorrection%>, <%=targetClass.getRawImportedInterfaceName()%>.class, msgs);
>     <%}%>
> 				return basicSet<%=genFeature.getAccessorName()%>((<%=genFeature.getImportedType(genClass)%>)otherEnd, msgs);
>@@ -1605,7 +1605,7 @@
> 		switch (eContainerFeatureID()<%=negativeOffsetCorrection%>)
> 		{
> <%for (GenFeature genFeature : genClass.getEBasicRemoveFromContainerGenFeatures()) {%>
>-  <%GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(reverseFeature) : "";%>
>+  <%GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(genFeature) : "";%>
> 			case <%=genClass.getQualifiedFeatureID(genFeature)%>:
> 				return eInternalContainer().eInverseRemove(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%><%=reverseOffsetCorrection%>, <%=targetClass.getRawImportedInterfaceName()%>.class, msgs);
> <%}%>
>Index: src/org/eclipse/emf/codegen/ecore/templates/model/Class.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/templates/model/Class.java,v
>retrieving revision 1.88
>diff -u -r1.88 Class.java
>--- src/org/eclipse/emf/codegen/ecore/templates/model/Class.java	16 Nov 2009 21:23:53 -0000	1.88
>+++ src/org/eclipse/emf/codegen/ecore/templates/model/Class.java	26 Nov 2009 17:00:25 -0000
>@@ -2166,7 +2166,7 @@
>     stringBuffer.append(genClass.getQualifiedFeatureID(genClass.getImplementedGenFeatures().get(0)));
>     stringBuffer.append(TEXT_162);
>     }
>-    if (isImplementation && genClass.hasOffsetCorrection() && !genModel.isReflectiveDelegation()) {
>+    if (isImplementation && !genModel.isReflectiveDelegation()) {
>     for (GenFeature genFeature : genClass.getImplementedGenFeatures()) { GenFeature reverseFeature = genFeature.getReverse();
>     if (reverseFeature != null && reverseFeature.getGenClass().hasOffsetCorrection()) {
>     stringBuffer.append(TEXT_163);
>@@ -2685,7 +2685,7 @@
>     stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
>     stringBuffer.append(negativeOffsetCorrection);
>     stringBuffer.append(TEXT_390);
>-    } else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(reverseFeature) : "";
>+    } else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(genFeature) : "";
>     stringBuffer.append(TEXT_391);
>     stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain"));
>     stringBuffer.append(TEXT_392);
>@@ -2707,7 +2707,7 @@
>     stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
>     stringBuffer.append(negativeOffsetCorrection);
>     stringBuffer.append(TEXT_400);
>-    } else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(reverseFeature) : "";
>+    } else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(genFeature) : "";
>     stringBuffer.append(TEXT_401);
>     stringBuffer.append(genFeature.getCapName());
>     stringBuffer.append(TEXT_402);
>@@ -3295,7 +3295,7 @@
>     }
>     stringBuffer.append(TEXT_656);
>     } else if (!genFeature.isVolatile()) {
>-    if (genFeature.isContainer()) { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(reverseFeature) : "";
>+    if (genFeature.isContainer()) { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(genFeature) : "";
>     stringBuffer.append(TEXT_657);
>     stringBuffer.append(genFeature.getCapName());
>     stringBuffer.append(TEXT_658);
>@@ -3387,7 +3387,7 @@
>     stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
>     stringBuffer.append(negativeOffsetCorrection);
>     stringBuffer.append(TEXT_698);
>-    } else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(reverseFeature) : "";
>+    } else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(genFeature) : "";
>     stringBuffer.append(TEXT_699);
>     stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));
>     stringBuffer.append(TEXT_700);
>@@ -4011,7 +4011,7 @@
>     stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
>     stringBuffer.append(negativeOffsetCorrection);
>     stringBuffer.append(TEXT_964);
>-    } else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(reverseFeature) : "";
>+    } else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(genFeature) : "";
>     stringBuffer.append(TEXT_965);
>     stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));
>     stringBuffer.append(TEXT_966);
>@@ -4759,7 +4759,7 @@
>     stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
>     stringBuffer.append(negativeOffsetCorrection);
>     stringBuffer.append(TEXT_1283);
>-    } else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(reverseFeature) : "";
>+    } else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(genFeature) : "";
>     stringBuffer.append(TEXT_1284);
>     stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));
>     stringBuffer.append(TEXT_1285);
>@@ -4869,7 +4869,7 @@
>     stringBuffer.append(negativeOffsetCorrection);
>     stringBuffer.append(TEXT_1332);
>     for (GenFeature genFeature : genClass.getEBasicRemoveFromContainerGenFeatures()) {
>-    GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(reverseFeature) : "";
>+    GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(genFeature) : "";
>     stringBuffer.append(TEXT_1333);
>     stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
>     stringBuffer.append(TEXT_1334);

Actions: View | Diff

Attachments on bug 296004: 152952 | 153019 | 153185 | 153186