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

Code streamlining.

Browse source
This commit is contained in:
Sergey Prigogin 2013-10-21 14:02:54 -07:00
parent 1e9005bdc8
commit 20e35e3e42
1 changed files with 20 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/IndexUI.java
View file

@ -13,7 +13,6 @@
package org.eclipse.cdt.internal.ui.viewsupport; package org.eclipse.cdt.internal.ui.viewsupport;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Properties; import java.util.Properties;
@ -103,7 +102,7 @@ public class IndexUI {
public static IIndexBinding elementToBinding(IIndex index, ICElement element, int linkageID) throws CoreException { public static IIndexBinding elementToBinding(IIndex index, ICElement element, int linkageID) throws CoreException {
if (element instanceof ISourceReference) { if (element instanceof ISourceReference) {
ISourceReference sf = ((ISourceReference)element); ISourceReference sf = ((ISourceReference) element);
ISourceRange range= sf.getSourceRange(); ISourceRange range= sf.getSourceRange();
if (range.getIdLength() != 0) { if (range.getIdLength() != 0) {
IIndexName name= elementToName(index, element, linkageID); IIndexName name= elementToName(index, element, linkageID);
@ -182,7 +181,7 @@ public class IndexUI {
public static IIndexName elementToName(IIndex index, ICElement element, int linkageID) throws CoreException { public static IIndexName elementToName(IIndex index, ICElement element, int linkageID) throws CoreException {
if (element instanceof ISourceReference) { if (element instanceof ISourceReference) {
ISourceReference sf = ((ISourceReference)element); ISourceReference sf = ((ISourceReference) element);
ITranslationUnit tu= sf.getTranslationUnit(); ITranslationUnit tu= sf.getTranslationUnit();
if (tu != null) { if (tu != null) {
IIndexFileLocation location= IndexLocationFactory.getIFL(tu); IIndexFileLocation location= IndexLocationFactory.getIFL(tu);
@ -211,7 +210,7 @@ public class IndexUI {
public static boolean isIndexed(IIndex index, ICElement element) throws CoreException { public static boolean isIndexed(IIndex index, ICElement element) throws CoreException {
if (element instanceof ISourceReference) { if (element instanceof ISourceReference) {
ISourceReference sf = ((ISourceReference)element); ISourceReference sf = ((ISourceReference) element);
ITranslationUnit tu= sf.getTranslationUnit(); ITranslationUnit tu= sf.getTranslationUnit();
if (tu != null) { if (tu != null) {
IIndexFileLocation location= IndexLocationFactory.getIFL(tu); IIndexFileLocation location= IndexLocationFactory.getIFL(tu);
@ -501,37 +500,35 @@ public class IndexUI {
public static List<? extends IBinding> findSpecializations(IIndex index, IBinding binding) throws CoreException { public static List<? extends IBinding> findSpecializations(IIndex index, IBinding binding) throws CoreException {
List<IBinding> result= null; List<IBinding> result= null;
// Check for instances of the given binding // Check for instances of the given binding.
if (binding instanceof ICPPInstanceCache) { if (binding instanceof ICPPInstanceCache) {
final List<ICPPTemplateInstance> instances= Arrays.asList(((ICPPInstanceCache) binding).getAllInstances()); ICPPTemplateInstance[] instances= ((ICPPInstanceCache) binding).getAllInstances();
if (!instances.isEmpty()) {
for (ICPPTemplateInstance inst : instances) { for (ICPPTemplateInstance inst : instances) {
if (!ASTInternal.hasDeclaration(inst)) { if (!ASTInternal.hasDeclaration(inst)) {
if (result == null) if (result == null)
result= new ArrayList<IBinding>(instances.size()); result= new ArrayList<IBinding>(instances.length);
result.add(inst); result.add(inst);
} }
} }
} }
}
// Check for specializations of the owner // Check for specializations of the owner.
IBinding owner = binding.getOwner(); IBinding owner = binding.getOwner();
if (owner != null) { if (owner != null) {
IASTNode point= null; // Instantiation of dependent expressions may not work. IASTNode point= null; // Instantiation of dependent expressions may not work.
for (IBinding specOwner : findSpecializations(index, owner)) { List<? extends IBinding> specializations = findSpecializations(index, owner);
for (IBinding specOwner : specializations) {
if (specOwner instanceof ICPPClassSpecialization) { if (specOwner instanceof ICPPClassSpecialization) {
// Add the specialized member // Add the specialized member.
IBinding specializedMember = ((ICPPClassSpecialization) specOwner).specializeMember(binding, point); IBinding specializedMember = ((ICPPClassSpecialization) specOwner).specializeMember(binding, point);
specializedMember= index.adaptBinding(specializedMember); specializedMember= index.adaptBinding(specializedMember);
if (specializedMember != null) { if (specializedMember != null) {
if (result == null) if (result == null)
result= new ArrayList<IBinding>(findSpecializations(index, owner).size()); result= new ArrayList<IBinding>(specializations.size());
result.add(specializedMember); result.add(specializedMember);
// Also add instances of the specialized member // Also add instances of the specialized member.
if (specializedMember instanceof ICPPInstanceCache) { if (specializedMember instanceof ICPPInstanceCache) {
final List<ICPPTemplateInstance> instances= Arrays.asList(((ICPPInstanceCache) specializedMember).getAllInstances()); ICPPTemplateInstance[] instances= ((ICPPInstanceCache) specializedMember).getAllInstances();
if (!instances.isEmpty()) {
for (ICPPTemplateInstance inst : instances) { for (ICPPTemplateInstance inst : instances) {
if (!ASTInternal.hasDeclaration(inst)) { if (!ASTInternal.hasDeclaration(inst)) {
result.add(inst); result.add(inst);
@ -542,7 +539,6 @@ public class IndexUI {
} }
} }
} }
}
if (result != null) { if (result != null) {
return result; return result;