diff options
author | Alain Magloire | 2004-07-06 18:16:08 +0000 |
---|---|---|
committer | Alain Magloire | 2004-07-06 18:16:08 +0000 |
commit | c6bd3609a28f3bcec6643dada7b8cb417506860c (patch) | |
tree | 3233c9c4a1b60efac258dfca66dff3114eee1263 | |
parent | e7bb872c9f327aee503f40d86259edefee082b57 (diff) | |
download | org.eclipse.cdt-c6bd3609a28f3bcec6643dada7b8cb417506860c.tar.gz org.eclipse.cdt-c6bd3609a28f3bcec6643dada7b8cb417506860c.tar.xz org.eclipse.cdt-c6bd3609a28f3bcec6643dada7b8cb417506860c.zip |
2004-07-06 Alain Magloire
Fix PR 69199
* browser/org/eclipse/cdt/core/browser/TypeInfo.java
-rw-r--r-- | core/org.eclipse.cdt.core/ChangeLog | 5 | ||||
-rw-r--r-- | core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/TypeInfo.java | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/core/org.eclipse.cdt.core/ChangeLog b/core/org.eclipse.cdt.core/ChangeLog index f8786238bd7..79c54dcd73a 100644 --- a/core/org.eclipse.cdt.core/ChangeLog +++ b/core/org.eclipse.cdt.core/ChangeLog @@ -1,3 +1,8 @@ +2004-07-06 Alain Magloire + + Fix PR 69199 + * browser/org/eclipse/cdt/core/browser/TypeInfo.java + 2004-07-06 Hoda Amer Fix for PR 68933 : [Content Assist] removes asterisks from parameter prompt diff --git a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/TypeInfo.java b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/TypeInfo.java index d04cdaeeedb..ae233c3dcf7 100644 --- a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/TypeInfo.java +++ b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/TypeInfo.java @@ -58,7 +58,10 @@ public class TypeInfo implements ITypeInfo ITypeReference ref = getResolvedReference(); if (ref != null) { ICElement[] elems = ref.getCElements(); - if (elems.length > 1) { + if (elems != null && elems.length > 0) { + if (elems.length == 1) + return elems[0]; + for (int i = 0; i < elems.length; ++i) { ICElement elem = elems[i]; if (elem.getElementType() == fElementType && elem.getElementName().equals(getName())) { @@ -66,8 +69,6 @@ public class TypeInfo implements ITypeInfo return elem; } } - } else if (elems.length == 1) { - return elems[0]; } } return null; |