Skip to main content
summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorAnton Leherbauer2009-08-26 03:53:49 -0400
committerAnton Leherbauer2009-08-26 03:53:49 -0400
commit13d9e97f42c74f6fe86c638b16e93a5ec319e9ae (patch)
tree7c81cfe65936c88fa8da233183818cf77ffce9fe /core
parent0c3e40acba5603c236aa1a2fe66e644118abefbf (diff)
downloadorg.eclipse.cdt-13d9e97f42c74f6fe86c638b16e93a5ec319e9ae.tar.gz
org.eclipse.cdt-13d9e97f42c74f6fe86c638b16e93a5ec319e9ae.tar.xz
org.eclipse.cdt-13d9e97f42c74f6fe86c638b16e93a5ec319e9ae.zip
Bug 280414 - Method search doesn't work in pop-up outline view (CTRL+O) when "Group method definitions" enabled
Diffstat (limited to 'core')
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AbstractCModelOutlinePage.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractInformationControl.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/COutlineInformationControl.java6
3 files changed, 7 insertions, 4 deletions
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AbstractCModelOutlinePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AbstractCModelOutlinePage.java
index 9f9724ad88..27706bb7da 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AbstractCModelOutlinePage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AbstractCModelOutlinePage.java
@@ -93,7 +93,7 @@ public abstract class AbstractCModelOutlinePage extends Page implements IContent
/**
* The default label provider for the outline.
*/
- protected static class COutlineLabelProvider extends AppearanceAwareLabelProvider {
+ public static class COutlineLabelProvider extends AppearanceAwareLabelProvider {
/**
* Flag whether to show member definitions with qualified or simple names.
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractInformationControl.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractInformationControl.java
index 7c054b9e95..3ff181e94c 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractInformationControl.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractInformationControl.java
@@ -55,6 +55,7 @@ import org.eclipse.ui.IEditorPart;
import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.cdt.core.model.IParent;
import org.eclipse.cdt.core.parser.Keywords;
+import org.eclipse.cdt.ui.CElementGrouping;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.ui.actions.CustomFiltersActionGroup;
@@ -102,7 +103,7 @@ public abstract class AbstractInformationControl extends PopupDialog implements
}
private boolean hasUnfilteredChild(TreeViewer viewer, Object element) {
- if (element instanceof IParent) {
+ if (element instanceof IParent || element instanceof CElementGrouping) {
Object[] children= ((ITreeContentProvider) viewer.getContentProvider()).getChildren(element);
for (Object element2 : children)
if (select(viewer, element, element2))
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/COutlineInformationControl.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/COutlineInformationControl.java
index 0624cf7abb..3f2bb413ed 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/COutlineInformationControl.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/COutlineInformationControl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2007 QNX Software Systems and others.
+ * Copyright (c) 2005, 2009 QNX Software Systems and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -24,6 +24,8 @@ import org.eclipse.swt.widgets.Tree;
import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.cdt.core.model.ITranslationUnit;
import org.eclipse.cdt.core.model.util.CElementBaseLabels;
+
+import org.eclipse.cdt.internal.ui.editor.AbstractCModelOutlinePage;
import org.eclipse.cdt.internal.ui.editor.CContentOutlinerProvider;
import org.eclipse.cdt.internal.ui.editor.LexicalSortingAction;
import org.eclipse.cdt.internal.ui.util.ProblemTreeViewer;
@@ -75,7 +77,7 @@ public class COutlineInformationControl extends AbstractInformationControl {
fSortingAction= new LexicalSortingAction(treeViewer, ".isChecked"); //$NON-NLS-1$
treeViewer.addFilter(new NamePatternFilter());
treeViewer.setLabelProvider(new DecoratingCLabelProvider(
- new AppearanceAwareLabelProvider(TEXT_FLAGS, IMAGE_FLAGS), true));
+ new AbstractCModelOutlinePage.COutlineLabelProvider(TEXT_FLAGS, IMAGE_FLAGS), true));
treeViewer.setAutoExpandLevel(AbstractTreeViewer.ALL_LEVELS);
return treeViewer;
}

Back to the top