From 2b164faf3ef30a535c40d3acec111b4cf4bf44a3 Mon Sep 17 00:00:00 2001 From: Markus Schorn Date: Wed, 2 Jul 2008 13:31:51 +0000 Subject: [PATCH] Model builder running in UI-thread, partial fix for 238940. --- .../internal/ui/cview/CViewElementComparer.java | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewElementComparer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewElementComparer.java index 66fd631ce28..df39fb1eac6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewElementComparer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewElementComparer.java @@ -10,10 +10,11 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.cview; +import org.eclipse.jface.viewers.IElementComparer; + import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.model.IWorkingCopy; -import org.eclipse.jface.viewers.IElementComparer; public class CViewElementComparer implements IElementComparer { @@ -55,16 +56,6 @@ public class CViewElementComparer implements IElementComparer { } public int hashCode(Object o1) { - ICElement c1= (o1 instanceof ICElement) ? (ICElement)o1 : null; - if (c1 == null) - return o1.hashCode(); - ITranslationUnit u1= (ITranslationUnit)c1.getAncestor(ICElement.C_UNIT); - if (u1 == null || !u1.isWorkingCopy()) - return o1.hashCode(); - // From here on c1 is a working copy. - c1= ((IWorkingCopy)u1).getOriginal(c1); - if (c1 == null) - return o1.hashCode(); - return c1.hashCode(); + return o1.hashCode(); } }