diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog index 30ab0f0c24b..b40222ddcb9 100644 --- a/debug/org.eclipse.cdt.debug.ui/ChangeLog +++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog @@ -1,3 +1,7 @@ +2003-06-05 Mikhail Khodjaiants + Changed the presentation of arrays and array types. + * CDTDebugModelPresentation.java + 2003-06-05 Mikhail Khodjaiants UI support of infinite values of the floating point types. * CDTDebugModelPresentation.java 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 895daebb241..3598ef40ec6 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 @@ -548,6 +548,16 @@ public class CDTDebugModelPresentation extends LabelProvider if ( type != null && type.length() > 0 ) { label.append( type ); + if ( ((ICVariable)var).isArray() ) + { + int[] dims = ((ICVariable)var).getArrayDimensions(); + for ( int i = 0; i < dims.length; ++i ) + { + label.append( '[' ); + label.append( dims[i] ); + label.append( ']' ); + } + } label.append( ' ' ); } } @@ -555,17 +565,7 @@ public class CDTDebugModelPresentation extends LabelProvider IValue value = var.getValue(); if ( value != null ) { - if ( ((ICVariable)var).isArray() ) - { - int[] dims = ((ICVariable)var).getArrayDimensions(); - for ( int i = 0; i < dims.length; ++i ) - { - label.append( '[' ); - label.append( dims[i] ); - label.append( ']' ); - } - } - else if ( ((ICVariable)var).isCharacter() && value.getValueString() != null ) + if ( ((ICVariable)var).isCharacter() && value.getValueString() != null ) { String valueString = value.getValueString().trim(); if ( valueString.length() == 0 ) @@ -585,7 +585,7 @@ public class CDTDebugModelPresentation extends LabelProvider label.append( "= " ); label.append( valueString ); } - else if ( !((ICVariable)var).isStructure() && value.getValueString() != null ) + else if ( !((ICVariable)var).isArray() && !((ICVariable)var).isStructure() && value.getValueString() != null ) { String valueString = value.getValueString().trim(); if ( valueString.length() > 0 )