[cdt-patch] Changed the presentation of arrays and array types

["Mikhail Khodjaiants" <mikhailk@xxxxxxx>]

Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.ui/ChangeLog,v
retrieving revision 1.155
diff -u -r1.155 ChangeLog
--- ChangeLog 5 Jun 2003 21:18:23 -0000 1.155
+++ ChangeLog 5 Jun 2003 22:04:27 -0000
@@ -1,4 +1,8 @@
 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
 
Index: src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java,v
retrieving revision 1.59
diff -u -r1.59 CDTDebugModelPresentation.java
--- src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java 5 Jun 2003 21:18:23 -0000 1.59
+++ src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java 5 Jun 2003 22:04:27 -0000
@@ -548,6 +548,16 @@
     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 @@
    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 @@
      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 )