mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

2004-09-01 Alain Magloire

Browse source 
Deal with the fact that elements can come
	from WorkingCopy or TranslationUnit
	* src/org/eclipse/cdt/internal/ui/cview/CViewElementComparer.java
This commit is contained in:
Alain Magloire 2004-09-02 01:00:51 +00:00
parent bff7d6fe56
commit b3e82309c9
2 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/org.eclipse.cdt.ui/ChangeLog
View file

@ -1,3 +1,9 @@
2004-09-01 Alain Magloire
Deal with the fact that elements can come
from WorkingCopy or TranslationUnit
* src/org/eclipse/cdt/internal/ui/cview/CViewElementComparer.java
2004-08-31 Alain Magloire 2004-08-31 Alain Magloire
Provide a Proxy wrapper for the includeRefence class Provide a Proxy wrapper for the includeRefence class

31
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewElementComparer.java
View file

@ -31,21 +31,26 @@ public class CViewElementComparer implements IElementComparer {
if (c1 == null || c2 == null) if (c1 == null || c2 == null)
return false; return false;
if (c1 instanceof ITranslationUnit) { // Below is for children of TranslationUnits but we have to make sure
ITranslationUnit t1 = (ITranslationUnit)o1; // we handle the case that the child comes from the a workingCopy in that
if (t1.isWorkingCopy()) { // case it should be equal as the original element.
c1 = ((IWorkingCopy)t1).getOriginalElement(); ITranslationUnit u1 = (ITranslationUnit)c1.getAncestor(ICElement.C_UNIT);
} ITranslationUnit u2 = (ITranslationUnit)c2.getAncestor(ICElement.C_UNIT);
} if (u1 == null || u2 == null) {
if (c2 instanceof ITranslationUnit) {
ITranslationUnit t2 = (ITranslationUnit)o2;
if (t2.isWorkingCopy()) {
c2 = ((IWorkingCopy)t2).getOriginalElement();
}
}
if (c1 == null || c2 == null) {
return false; return false;
} }
if (u1.isWorkingCopy() && u2.isWorkingCopy() || !u1.isWorkingCopy() && !u2.isWorkingCopy()) {
return false;
}
// From here on either c1 or c2 is a working copy.
if (u1.isWorkingCopy()) {
c1= ((IWorkingCopy)u1).getOriginal(c1);
} else if (u2.isWorkingCopy()) {
c2= ((IWorkingCopy)u2).getOriginal(c2);
}
if (c1 == null || c2 == null)
return false;
return c1.equals(c2); return c1.equals(c2);
} }