diff options
author | Alain Magloire | 2004-07-06 18:15:56 +0000 |
---|---|---|
committer | Alain Magloire | 2004-07-06 18:15:56 +0000 |
commit | e7bb872c9f327aee503f40d86259edefee082b57 (patch) | |
tree | b108a03f7511cd5208838c7f285d6e3c88c034ce | |
parent | b04b89db82a5325f545e28d9291157b7c39b21f6 (diff) | |
download | org.eclipse.cdt-e7bb872c9f327aee503f40d86259edefee082b57.tar.gz org.eclipse.cdt-e7bb872c9f327aee503f40d86259edefee082b57.tar.xz org.eclipse.cdt-e7bb872c9f327aee503f40d86259edefee082b57.zip |
2004-07-06 Chris Weibe
Fix for PR 69199
* src/org/eclipse/cdt/internal/ui/viewsupport/CElementLabels.java
-rw-r--r-- | core/org.eclipse.cdt.ui/ChangeLog | 5 | ||||
-rw-r--r-- | core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementLabels.java | 15 |
2 files changed, 15 insertions, 5 deletions
diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index eef04687744..945a6764db4 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -1,3 +1,8 @@ +2004-07-06 Chris Weibe + + Fix for PR 69199 + * src/org/eclipse/cdt/internal/ui/viewsupport/CElementLabels.java + 2004-07-06 Hoda Amer Fix for PR 69330 : Outline is flickering. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementLabels.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementLabels.java index e33d8ba7e19..a400dab5434 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementLabels.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementLabels.java @@ -326,8 +326,11 @@ public class CElementLabels { //qualification if( getFlag( flags, M_FULLY_QUALIFIED ) ){ - getTypeLabel( method.getParent(), T_FULLY_QUALIFIED | (flags & P_COMPRESSED), buf ); - buf.append( "::" ); //$NON-NLS-1$ + ICElement parent = method.getParent(); + if (parent != null && parent.exists()) { + getTypeLabel( parent, T_FULLY_QUALIFIED | (flags & P_COMPRESSED), buf ); + buf.append( "::" ); //$NON-NLS-1$ + } } buf.append( method.getElementName() ); @@ -455,9 +458,11 @@ public class CElementLabels { public static void getTypeLabel(ICElement elem, int flags, StringBuffer buf) { if (getFlag(flags, T_FULLY_QUALIFIED)) { ISourceRoot root= CModelUtil.getSourceRoot(elem); - getSourceRootLabel(root, (flags & P_COMPRESSED), buf); - buf.append(root.getElementName()); - buf.append('.'); + if (root != null) { + getSourceRootLabel(root, (flags & P_COMPRESSED), buf); + buf.append(root.getElementName()); + buf.append('.'); + } } String typeName= elem.getElementName(); |