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

Improve labels in DOMASTViewer.

Browse source
This commit is contained in:
Markus Schorn 2008-12-01 09:18:50 +00:00
parent 0581a953b4
commit 14e574420d
1 changed files with 40 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMASTNodeLeaf.java
View file

@ -12,6 +12,11 @@ package org.eclipse.cdt.ui.tests.DOMAST;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Set;
import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertyDescriptor;
@ -83,10 +88,15 @@ public class DOMASTNodeLeaf implements IAdaptable {
// used for applying filters to the tree, since it is lazily populated // used for applying filters to the tree, since it is lazily populated
// all parents of the desired tree object to display need to have a flag as well // all parents of the desired tree object to display need to have a flag as well
private int filterFlag = 0; private int filterFlag = 0;
private static Set<String> ignoreInterfaces= new HashSet<String>();
public static final int FLAG_PROBLEM = 1<<0; public static final int FLAG_PROBLEM = 1<<0;
public static final int FLAG_PREPROCESSOR = 1<<1; public static final int FLAG_PREPROCESSOR = 1<<1;
public static final int FLAG_INCLUDE_STATEMENTS = 1<<2; public static final int FLAG_INCLUDE_STATEMENTS = 1<<2;
static {
ignoreInterfaces.addAll(Arrays.asList(new String[] {
"IASTCompletionContext", "IASTNode"
}));
}
public DOMASTNodeLeaf(IASTNode node) { public DOMASTNodeLeaf(IASTNode node) {
this.node = node; this.node = node;
} }
@ -106,9 +116,11 @@ public class DOMASTNodeLeaf implements IAdaptable {
string.startsWith(ICPPAST_PREFIX) || string.startsWith(ICPPAST_PREFIX) ||
string.startsWith(IGPPAST_PREFIX) || string.startsWith(IGPPAST_PREFIX) ||
string.startsWith(IGNUAST_PREFIX) || string.startsWith(IGNUAST_PREFIX) ||
string.startsWith(IGCCAST_PREFIX)) string.startsWith(IGCCAST_PREFIX)) {
if (!ignoreInterfaces.contains(string)) {
return true; return true;
}
}
return false; return false;
} }
@ -116,26 +128,30 @@ public class DOMASTNodeLeaf implements IAdaptable {
public String toString() { public String toString() {
if( node == null ) return BLANK_STRING; if( node == null ) return BLANK_STRING;
StringBuffer buffer = new StringBuffer(); StringBuffer buffer = new StringBuffer();
List<Class<?>> search= new LinkedList<Class<?>>();
boolean done= false;
Class<?> clazz= node.getClass(); for (search.add(node.getClass()); !search.isEmpty(); ) {
Class<?>[] classes = clazz.getInterfaces(); Class<?> clazz= search.remove(0);
while (classes.length == 0) { boolean needComma= false;
clazz= clazz.getSuperclass(); if (clazz.isInterface()) {
if (clazz == null) if (clazz.getPackage().toString().indexOf(INTERNAL) < 0) {
break; String interfaceName= clazz.getName();
classes= clazz.getInterfaces(); interfaceName= interfaceName.substring(interfaceName.lastIndexOf(PERIOD) + 1);
}
for(int i=0; i<classes.length; i++) {
if (classes[i].getPackage().toString().indexOf(INTERNAL) >= 0)
continue;
String interfaceName = classes[i].getName().substring(classes[i].getName().lastIndexOf(PERIOD) + 1);
if (hasProperPrefix(interfaceName)) { if (hasProperPrefix(interfaceName)) {
buffer.append(interfaceName); if (needComma)
if (i+1 < classes.length &&
hasProperPrefix(classes[i+1].getName().substring(classes[i+1].getName().lastIndexOf(PERIOD) + 1)) &&
classes[i+1].getPackage().toString().indexOf(INTERNAL) < 0)
buffer.append(LIST_SEPARATOR); buffer.append(LIST_SEPARATOR);
buffer.append(interfaceName);
needComma= true;
done= true;
}
}
}
if (!done) {
search.addAll(Arrays.asList((Class<?>[])clazz.getInterfaces()));
final Class<?> superclass = clazz.getSuperclass();
if (superclass != null)
search.add(superclass);
} }
} }