diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog index 990641cb0c5..74d7e85423a 100644 --- a/debug/org.eclipse.cdt.debug.ui/ChangeLog +++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog @@ -1,3 +1,7 @@ +2003-11-21 Mikhail Khodjaiants + Use "symbol not available" for empty function names when generating a stack frame label. + * CDTDebugModelPresentation.java + 2003-11-13 Mikhail Khodjaiants Use 'StringBuffer' instead of 'String' when generating stack frame labels. Added a label for dummy stack frames instead of using the name provided by the rendered object. diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java index 6a7e46c2fe3..20f4c97de93 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java @@ -526,9 +526,11 @@ public class CDTDebugModelPresentation extends LabelProvider StringBuffer label = new StringBuffer(); label.append( info.getLevel() ); label.append( ' ' ); - if ( info.getFunction() != null ) + + String function = info.getFunction(); + if ( function != null ) { - String function = info.getFunction().trim(); + function = function.trim(); if ( function.length() > 0 ) { label.append( function ); @@ -547,7 +549,7 @@ public class CDTDebugModelPresentation extends LabelProvider } } } - else + if ( isEmpty( function ) ) label.append( "" ); return label.toString(); } @@ -1001,4 +1003,9 @@ public class CDTDebugModelPresentation extends LabelProvider { fImageCache.disposeAll(); } + + private boolean isEmpty( String str ) + { + return ( str == null || str.length() == 0 ); + } }