From 143ff15904a3610198a0a6d23725ad5b8843773a Mon Sep 17 00:00:00 2001 From: Hoda Amer Date: Thu, 15 Jul 2004 18:11:23 +0000 Subject: [PATCH] Bug Fixing --- core/org.eclipse.cdt.ui/ChangeLog | 3 +++ .../corext/refactoring/rename/RenameElementProcessor.java | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index 8ec23013e49..15439f1e9b5 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -1,3 +1,6 @@ +2004-07-15 Hoda Amer + Fix for PR 68500: [Outline View] After doing a rename of a class, the outline viewer does not display the new name (just the old name) + 2004-07-09 Hoda Amer Fix for PR 69510 : [C++ Class Wizard] error message in C++ Class Wizard if invoke Class Wizard from existing C++ class in C/C++ Project View diff --git a/core/org.eclipse.cdt.ui/refactor/org/eclipse/cdt/internal/corext/refactoring/rename/RenameElementProcessor.java b/core/org.eclipse.cdt.ui/refactor/org/eclipse/cdt/internal/corext/refactoring/rename/RenameElementProcessor.java index dc784f48a60..184001cc5e2 100644 --- a/core/org.eclipse.cdt.ui/refactor/org/eclipse/cdt/internal/corext/refactoring/rename/RenameElementProcessor.java +++ b/core/org.eclipse.cdt.ui/refactor/org/eclipse/cdt/internal/corext/refactoring/rename/RenameElementProcessor.java @@ -619,19 +619,23 @@ public class RenameElementProcessor extends RenameProcessor implements IReferenc parent = parent.getParent(); level++; } + // now we are at the first folder or project container // get siblings at level = level Set parentsSet = new HashSet(); Set childrenSet = new HashSet(); ICElement[] pr =((IParent)parent).getChildren(); + // add all translation unit children but not subfolders for (int i =0; i < pr.length; i++){ - parentsSet.add(pr[i]); + if(!(pr[i] instanceof ICContainer)) + parentsSet.add(pr[i]); } + // compare to elements in added translation units. int currentLevel = 1; while (currentLevel < level) { Iterator itr = parentsSet.iterator(); while (itr.hasNext()){ Object o = itr.next(); - if((o instanceof ISourceManipulation) || (o instanceof ICContainer)){ + if(o instanceof ISourceManipulation) { ICElement p = (ICElement)o; if(p instanceof IParent){ ICElement[] ch = ((IParent)p).getChildren();