From 6c4db4a4b8d588d7971238f9d8000ed70997ffcd Mon Sep 17 00:00:00 2001 From: Doug Schaefer Date: Fri, 26 May 2006 17:06:24 +0000 Subject: [PATCH] Implemented a couple of methods in PDOMCPPClassType which are now called since I fixed qualified name support. Also fixed the label for the text selection query to show which text we're searching for. --- .../core/pdom/dom/cpp/PDOMCPPClassType.java | 13 +++++++++++-- .../ui/search/PDOMSearchTextSelectionQuery.java | 4 ++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassType.java index 8909b11133a..7a8e0012fd2 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassType.java @@ -147,7 +147,8 @@ public class PDOMCPPClassType extends PDOMMemberOwner implements ICPPClassType, } public void addName(IASTName name) throws DOMException { - throw new PDOMNotImplementedError(); + // TODO - this might be a better way of adding names to scopes + // but for now do nothing. } public IBinding[] find(String name) throws DOMException { @@ -178,7 +179,15 @@ public class PDOMCPPClassType extends PDOMMemberOwner implements ICPPClassType, } public IASTName getScopeName() throws DOMException { - throw new PDOMNotImplementedError(); + try { + IASTName name = getFirstDefinition(); + if (name == null) + name = getFirstDefinition(); + return name; + } catch (CoreException e) { + CCorePlugin.log(e); + return null; + } } public boolean isFullyCached() throws DOMException { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchTextSelectionQuery.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchTextSelectionQuery.java index e7ff2f991cf..eec83f2b2c2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchTextSelectionQuery.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchTextSelectionQuery.java @@ -56,4 +56,8 @@ public class PDOMSearchTextSelectionQuery extends PDOMSearchQuery { } } + public String getLabel() { + return super.getLabel() + " " + selection.getText(); + } + }