Attachment 115671 Details for Bug 248069 – Improved fix.

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

[patch] Improved fix.

248069.patch (text/plain), 1.31 KB, created by Ed Merks

on 2008-10-21 06:43:06 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ed Merks

Created: 2008-10-21 06:43:06 EDT

Size: 1.31 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.emf.databinding
>Index: src/org/eclipse/emf/databinding/EObjectObservableMap.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.databinding/src/org/eclipse/emf/databinding/EObjectObservableMap.java,v
>retrieving revision 1.3
>diff -u -r1.3 EObjectObservableMap.java
>--- src/org/eclipse/emf/databinding/EObjectObservableMap.java	26 Jan 2008 20:56:46 -0000	1.3
>+++ src/org/eclipse/emf/databinding/EObjectObservableMap.java	21 Oct 2008 10:40:12 -0000
>@@ -25,6 +25,7 @@
> import org.eclipse.emf.common.notify.impl.AdapterImpl;
> import org.eclipse.emf.ecore.EObject;
> import org.eclipse.emf.ecore.EStructuralFeature;
>+import org.eclipse.emf.ecore.util.ExtendedMetaData;
> 
> /**
>  * PROVISIONAL
>@@ -62,7 +63,6 @@
>   {
>     super(objects);
>     this.eStructuralFeature = feature;
>-    init();
>   }
> 
>   @Override
>@@ -80,7 +80,11 @@
>   @Override
>   protected Object doGet(Object key)
>   {
>-    return ((EObject)key).eGet(eStructuralFeature);
>+    EObject eObject = (EObject)key;
>+    return  
>+      ExtendedMetaData.INSTANCE.getAffiliation(eObject.eClass(), eStructuralFeature) == null ?
>+        null :
>+        eObject.eGet(eStructuralFeature);
>   }
> 
>   @Override

Actions: View | Diff

Attachments on bug 248069: 113085 | 113086 | 115671