Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Goubet2016-07-06 11:19:50 -0400
committerLaurent Delaigue2016-07-15 11:05:32 -0400
commit4afcf74e457f1609ce68e24e22c24091d1ee4b14 (patch)
tree4984111a7657be9b4f1369c83d5c48790764e29f
parentd0eb2f08d3ee8ecff54d068a8747ccee5bd69ff3 (diff)
downloadorg.eclipse.emf.compare-4afcf74e457f1609ce68e24e22c24091d1ee4b14.tar.gz
org.eclipse.emf.compare-4afcf74e457f1609ce68e24e22c24091d1ee4b14.tar.xz
org.eclipse.emf.compare-4afcf74e457f1609ce68e24e22c24091d1ee4b14.zip
[497399] tagged values tooltips throw IAEs
-rw-r--r--plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/tooltip/AbstractTooltipProvider.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/tooltip/AbstractTooltipProvider.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/tooltip/AbstractTooltipProvider.java
index 04c11d698..ce0240153 100644
--- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/tooltip/AbstractTooltipProvider.java
+++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/tooltip/AbstractTooltipProvider.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.compare.ResourceLocationChange;
import org.eclipse.emf.compare.internal.merge.MergeMode;
import org.eclipse.emf.compare.provider.ISemanticObjectLabelProvider;
import org.eclipse.emf.compare.utils.MatchUtil;
+import org.eclipse.emf.compare.utils.ReferenceUtil;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
@@ -190,7 +191,7 @@ public abstract class AbstractTooltipProvider<T extends Diff> extends AdapterImp
private String getPreviousValue(EStructuralFeature eStructuralFeature, EObject eObject) {
Object ancestor = null;
if (eObject != null) {
- ancestor = eObject.eGet(eStructuralFeature);
+ ancestor = ReferenceUtil.safeEGet(eObject, eStructuralFeature);
}
String value = ""; //$NON-NLS-1$
if (ancestor instanceof EObject) {

Back to the top