[cdt-patch] Removed the gdb-specific variable parsing (UI)

["Mikhail Khodjaiants" <mikhailk@xxxxxxx>]

Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.ui/ChangeLog,v
retrieving revision 1.113
diff -u -r1.113 ChangeLog
--- ChangeLog 17 Mar 2003 21:25:20 -0000 1.113
+++ ChangeLog 18 Mar 2003 21:03:49 -0000
@@ -1,3 +1,8 @@
+2003-03-18 Mikhail Khodjaiants
+ Removed the gdb-specific variable parsing.
+ * VariableFormatActionDelegate.java
+ * CDTDebugModelPresentation.java
+
 2003-03-17 Mikhail Khodjaiants
  Replace range by start index and length in 'Display As Array' action.
  * CastToArrayActionDelegate.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.44
diff -u -r1.44 CDTDebugModelPresentation.java
--- src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java 17 Mar 2003 21:29:54 -0000 1.44
+++ src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java 18 Mar 2003 21:03:50 -0000
@@ -25,7 +25,7 @@
 import org.eclipse.cdt.debug.core.model.ICFunctionBreakpoint;
 import org.eclipse.cdt.debug.core.model.ICLineBreakpoint;
 import org.eclipse.cdt.debug.core.model.ICSharedLibrary;
-import org.eclipse.cdt.debug.core.model.ICValue;
+import org.eclipse.cdt.debug.core.model.ICVariable;
 import org.eclipse.cdt.debug.core.model.ICWatchpoint;
 import org.eclipse.cdt.debug.core.model.IDummyStackFrame;
 import org.eclipse.cdt.debug.core.model.IExecFileInfo;
@@ -489,29 +489,9 @@
    }
    label += var.getName();
    IValue value = var.getValue();
-   if ( value != null && value.getValueString() != null )
+   if ( value != null && value.getValueString() != null && value.getValueString().trim().length() > 0 )
    {
-    if ( value instanceof ICValue )
-    {
-     switch( ((ICValue)value).getType() )
-     {
-      case ICValue.TYPE_ARRAY:
-       label += value.getValueString();
-       break;
-      case ICValue.TYPE_STRUCTURE:
-       break;
-      case ICValue.TYPE_KEYWORD:
-       break;
-      default:
-       label += "= " + value.getValueString();
-       break;
-       
-     }
-    }
-    else
-    {
-     label += "= " + value.getValueString();
-    }
+    label += "= " + value.getValueString();
    }
   }
   return label;
@@ -787,24 +767,11 @@
 
  protected Image getVariableImage( IVariable element ) throws DebugException
  {
-  if ( element != null )
-  {
-   IValue value = element.getValue();
-   if ( value instanceof ICValue )
-    return getValueTypeImage( (ICValue)value );
-  }
-  return null;
- }
-
- protected Image getValueTypeImage( ICValue element )
- {
-  if ( element != null )
+  if ( element instanceof ICVariable )
   {
-   if ( element.getType() == ICValue.TYPE_ARRAY ||
-     element.getType() == ICValue.TYPE_STRUCTURE ||
-     element.getType() == ICValue.TYPE_KEYWORD )
+   if ( !((ICVariable)element).isEditable() )
     return fDebugImageRegistry.get( new CImageDescriptor( CDebugImages.DESC_OBJS_VARIABLE_AGGREGATE,  0 ) );
-   else if ( element.getType() == ICValue.TYPE_POINTER )
+   else if ( ((ICVariable)element).hasChildren() )
     return fDebugImageRegistry.get( new CImageDescriptor( CDebugImages.DESC_OBJS_VARIABLE_POINTER,  0 ) );
    else
     return fDebugImageRegistry.get( new CImageDescriptor( CDebugImages.DESC_OBJS_VARIABLE_SIMPLE, 0 ) );
Index: src/org/eclipse/cdt/debug/internal/ui/actions/VariableFormatActionDelegate.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/VariableFormatActionDelegate.java,v
retrieving revision 1.2
diff -u -r1.2 VariableFormatActionDelegate.java
--- src/org/eclipse/cdt/debug/internal/ui/actions/VariableFormatActionDelegate.java 17 Dec 2002 21:54:18 -0000 1.2
+++ src/org/eclipse/cdt/debug/internal/ui/actions/VariableFormatActionDelegate.java 18 Mar 2003 21:03:50 -0000
@@ -6,12 +6,10 @@
 package org.eclipse.cdt.debug.internal.ui.actions;
 
 import org.eclipse.cdt.debug.core.cdi.ICDIFormat;
-import org.eclipse.cdt.debug.core.model.ICValue;
 import org.eclipse.cdt.debug.core.model.ICVariable;
 import org.eclipse.cdt.debug.ui.CDebugUIPlugin;
 import org.eclipse.core.runtime.MultiStatus;
 import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.IValue;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -114,28 +112,7 @@
  
  private boolean enablesFor( ICVariable var )
  {
-  boolean enabled = false;
-  try
-  {
-   IValue value = var.getValue();
-   if ( value != null && value instanceof ICValue )
-   {
-    switch( ((ICValue)value).getType() )
-    {
-//     case ICValue.TYPE_ARRAY:
-     case ICValue.TYPE_SIMPLE:
-     case ICValue.TYPE_POINTER:
-     case ICValue.TYPE_CHAR:
-      enabled = true;
-      break;
-    }
-   }
- 
-  }
-  catch( DebugException e )
-  {
-  }
-  return enabled;
+  return var.isEditable();
  }
  
  private void setVariable( ICVariable var )