mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-09-08 02:53:12 +02:00
Code Issues Wiki Activity

2004-0618 Alain Magloire

Browse source 
Patch from Chris W. to fix PR 6606
This commit is contained in:
Alain Magloire 2004-06-18 19:00:35 +00:00
parent c191bced9d
commit 502926556a
3 changed files with 35 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,3 +1,6 @@
2004-0618 Alain Magloire
Patch from Chris W. to fix PR 6606
2004-06-17 Tanya Wolff 2004-06-17 Tanya Wolff
Fix for PR 60616: [Accessibility] Fix for PR 60616: [Accessibility]
Removed mnemonics for reusable code Browse & Variables buttons, Removed mnemonics for reusable code Browse & Variables buttons,

25
core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/CBrowsingPart.java
View file

@ -23,8 +23,10 @@ import org.eclipse.cdt.core.browser.TypeSearchScope;
import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.CModelException;
import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.CoreModel;
import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.cdt.core.model.ICElementVisitor;
import org.eclipse.cdt.core.model.ICModel; import org.eclipse.cdt.core.model.ICModel;
import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.cdt.core.model.IParent;
import org.eclipse.cdt.core.model.ISourceRoot; import org.eclipse.cdt.core.model.ISourceRoot;
import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.model.ITranslationUnit;
import org.eclipse.cdt.core.resources.FileStorage; import org.eclipse.cdt.core.resources.FileStorage;
@ -45,6 +47,7 @@ import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IStorage; import org.eclipse.core.resources.IStorage;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
@ -711,6 +714,26 @@ public abstract class CBrowsingPart extends ViewPart implements IMenuListener, I
return null; return null;
} }
private static boolean hasChild(final ICElement parent, final ICElement child) {
final boolean foundChild[] = { false };
final ICElementVisitor visitor = new ICElementVisitor() {
public boolean visit(ICElement element) throws CoreException {
if (foundChild[0])
return false;
if (element.equals(child)) {
foundChild[0] = true;
return false;
}
return true;
}
};
try {
parent.accept(visitor);
} catch (CoreException e) {
}
return foundChild[0];
}
protected Object getTypesInput(Object element) { protected Object getTypesInput(Object element) {
if (element instanceof ICModel || element instanceof ICProject || element instanceof ISourceRoot) { if (element instanceof ICModel || element instanceof ICProject || element instanceof ISourceRoot) {
return null; return null;
@ -737,7 +760,7 @@ public abstract class CBrowsingPart extends ViewPart implements IMenuListener, I
ITypeInfo enclosedType = enclosedTypes[j]; ITypeInfo enclosedType = enclosedTypes[j];
if (enclosedType.getResolvedReference() != null) { if (enclosedType.getResolvedReference() != null) {
ICElement typeElem = enclosedType.getResolvedReference().getCElement(); ICElement typeElem = enclosedType.getResolvedReference().getCElement();
if (typeElem != null && typeElem.equals(cElem)) { if (typeElem != null && (typeElem.equals(cElem) || (typeElem instanceof IParent && hasChild(typeElem, cElem)))) {
return namespaces[i]; return namespaces[i];
} }
} }

8
core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/MembersViewContentProvider.java
View file

@ -52,6 +52,10 @@ class MembersViewContentProvider extends CBrowsingContentProvider {
ITypeInfo info = (ITypeInfo) element; ITypeInfo info = (ITypeInfo) element;
return (info.getCElementType() != ICElement.C_TYPEDEF); return (info.getCElementType() != ICElement.C_TYPEDEF);
} }
if (element instanceof IParent) {
return ((IParent)element).hasChildren();
}
return false; return false;
// } catch (CModelException e) { // } catch (CModelException e) {
@ -100,6 +104,10 @@ class MembersViewContentProvider extends CBrowsingContentProvider {
} }
return NO_CHILDREN; return NO_CHILDREN;
} }
if (element instanceof IParent) {
return ((IParent)element).getChildren();
}
return NO_CHILDREN; return NO_CHILDREN;
} catch (CModelException e) { } catch (CModelException e) {