Attachment 66914 Details for Bug 186256 – Added type names support. (+committed, +logged)

[patch] Added type names support. (+committed, +logged)

variables-view.patch (text/plain), 10.72 KB, created by Fran Litterio

on 2007-05-11 13:33:44 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Fran Litterio

Created: 2007-05-11 13:33:44 EDT

Size: 10.72 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.dd.dsf.debug.ui
>Index: src/org/eclipse/dd/dsf/debug/ui/viewmodel/variable/VariableLocalsLayoutNode.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.dd.dsf/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/variable/VariableLocalsLayoutNode.java,v
>retrieving revision 1.1
>diff -u -r1.1 VariableLocalsLayoutNode.java
>--- src/org/eclipse/dd/dsf/debug/ui/viewmodel/variable/VariableLocalsLayoutNode.java	9 May 2007 21:24:17 -0000	1.1
>+++ src/org/eclipse/dd/dsf/debug/ui/viewmodel/variable/VariableLocalsLayoutNode.java	11 May 2007 17:25:55 -0000
>@@ -40,7 +40,7 @@
> import org.eclipse.debug.internal.ui.viewers.model.provisional.ILabelUpdate;
> import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta;
> 
>-@SuppressWarnings("restriction")
>+@SuppressWarnings({"restriction", "nls"})
> public class VariableLocalsLayoutNode extends AbstractDMVMLayoutNode<IExpressionDMData> {
> 
>     public VariableLocalsLayoutNode(AbstractVMProvider provider, DsfSession session) {
>@@ -91,10 +91,12 @@
>                         for (int idx = 0; idx < localColumns.length; idx++) {
>                             if (IDebugVMConstants.COLUMN_ID__NAME.equals(localColumns[idx])) {
>                                 update.setLabel(getData().getName(), idx);
>+                            } else if (IDebugVMConstants.COLUMN_ID__TYPE.equals(localColumns[idx])) {
>+                                update.setLabel(getData().getTypeName(), idx);
>                             } else if (IDebugVMConstants.COLUMN_ID__VALUE.equals(localColumns[idx])) {
>                                 weAreExtractingFormattedData = true;
>                             } else if (IDebugVMConstants.COLUMN_ID__DESCRIPTION.equals(localColumns[idx])) {
>-                                update.setLabel("", idx); //$NON-NLS-1$
>+                                update.setLabel("", idx);
>                             }
>                         }
>                         
>Index: src/org/eclipse/dd/dsf/debug/ui/viewmodel/variable/VariableSubExpressionsLayoutNode.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.dd.dsf/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/variable/VariableSubExpressionsLayoutNode.java,v
>retrieving revision 1.1
>diff -u -r1.1 VariableSubExpressionsLayoutNode.java
>--- src/org/eclipse/dd/dsf/debug/ui/viewmodel/variable/VariableSubExpressionsLayoutNode.java	9 May 2007 21:24:17 -0000	1.1
>+++ src/org/eclipse/dd/dsf/debug/ui/viewmodel/variable/VariableSubExpressionsLayoutNode.java	11 May 2007 17:25:58 -0000
>@@ -101,6 +101,8 @@
>                         for (int idx = 0; idx < localColumns.length; idx++) {
>                             if (IDebugVMConstants.COLUMN_ID__NAME.equals(localColumns[idx])) {
>                                 update.setLabel(getData().getName(), idx);
>+                            } else if (IDebugVMConstants.COLUMN_ID__TYPE.equals(localColumns[idx])) {
>+                                update.setLabel(getData().getTypeName(), idx);
>                             } else if (IDebugVMConstants.COLUMN_ID__VALUE.equals(localColumns[idx])) {
>                                 weAreExtractingFormattedData = true;
>                             } else if (IDebugVMConstants.COLUMN_ID__DESCRIPTION.equals(localColumns[idx])) {
>#P org.eclipse.dd.dsf.debug
>Index: src/org/eclipse/dd/dsf/debug/service/IExpressions.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.dd.dsf/plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/service/IExpressions.java,v
>retrieving revision 1.5
>diff -u -r1.5 IExpressions.java
>--- src/org/eclipse/dd/dsf/debug/service/IExpressions.java	2 May 2007 19:49:34 -0000	1.5
>+++ src/org/eclipse/dd/dsf/debug/service/IExpressions.java	11 May 2007 17:26:14 -0000
>@@ -23,6 +23,7 @@
>  * dependencies on the Modules service, RunControl service, and Stack service, as all may be used to
>  * provide context for an expression to be evaluated.
>  */
>+@SuppressWarnings("nls")
> public interface IExpressions extends IDMService, IFormattedValues {
>     
>     /**
>@@ -40,12 +41,12 @@
>         // These static fields define the possible return values of method getTypeId().  QUESTION: Why can't
>         // these have type int?
>         
>-        final static String TYPEID_UNKNOWN = "TYPEID_UNKNOWN";  //$NON-NLS-1$
>-        final static String TYPEID_INTEGER = "TYPEID_INTEGER";  //$NON-NLS-1$
>-        final static String TYPEID_CHAR = "TYPEID_CHAR";  //$NON-NLS-1$
>-        final static String TYPEID_FLOAT = "TYPEID_FLOAT";  //$NON-NLS-1$
>-        final static String TYPEID_DOUBLE = "TYPEID_DOUBLE";  //$NON-NLS-1$
>-        final static String TYPEID_OPAQUE = "TYPEID_OPAQUE";  //$NON-NLS-1$
>+        final static String TYPEID_UNKNOWN = "TYPEID_UNKNOWN";
>+        final static String TYPEID_INTEGER = "TYPEID_INTEGER";
>+        final static String TYPEID_CHAR = "TYPEID_CHAR";
>+        final static String TYPEID_FLOAT = "TYPEID_FLOAT";
>+        final static String TYPEID_DOUBLE = "TYPEID_DOUBLE";
>+        final static String TYPEID_OPAQUE = "TYPEID_OPAQUE";
>         
>         /**
>          * This enumerates the possible basic types that an expression can have.
>@@ -99,14 +100,6 @@
>         int getBitCount();
>         
>         /**
>-         * @return A string containing the value of the expression in a format that is natural for its type.
>-         *         For example, type "char" is shown as a single-quoted character, type "int" (and its cousins)
>-         *         is shown in decimal, type "unsigned int" (and its cousins) and pointers are shown in hex,
>-         *         floating point values are shown in non-scientific notation.
>-         */
>-        String getNaturalValue();
>-        
>-        /**
>          * @return A string containing the value of the expression as returned by the debugger backend.
>          */
>         String getStringValue();
>#P org.eclipse.dd.dsf.mi.core
>Index: src/org/eclipse/dd/dsf/mi/service/ExpressionService.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.dd.dsf/plugins/org.eclipse.dd.dsf.mi.core/src/org/eclipse/dd/dsf/mi/service/ExpressionService.java,v
>retrieving revision 1.9
>diff -u -r1.9 ExpressionService.java
>--- src/org/eclipse/dd/dsf/mi/service/ExpressionService.java	2 May 2007 19:49:37 -0000	1.9
>+++ src/org/eclipse/dd/dsf/mi/service/ExpressionService.java	11 May 2007 17:26:32 -0000
>@@ -45,6 +45,7 @@
>  * This class implements a debugger expression evaluator as a DSF service.  The primary
>  * interface that clients of this class should use is IExpressions.
>  */
>+@SuppressWarnings("nls")
> public class ExpressionService extends AbstractDsfService implements IExpressions
> {
>     /**
>@@ -108,12 +109,6 @@
>             return null; 
>         }
> 
>-        public String getNaturalValue()
>-        {
>-            // ISSUE: Is this correct?
>-            return Integer.toString(Integer.parseInt(expressionValue, 10));
>-        }
>-
>         public IRegisterDMContext getRegister()
>         {
>             return null;
>@@ -134,16 +129,10 @@
>             return null;
>         }
>         
>-        /**
>-         * @see IExpressions.getArrayLength()
>-         */
>         public long getArrayLength() {
>             return -1;
>         }
>         
>-        /**
>-         * @see IExpressions.getFields()
>-         */
>         public Iterator<String> getFields() {
>             return null;
>         }
>@@ -162,7 +151,7 @@
>      */
>     private void doInitialize(RequestMonitor requestMonitor)
>     {
>-        fServiceDMC = new ServiceDMContext<ExpressionService>(this, "#expression"); //$NON-NLS-1$
>+        fServiceDMC = new ServiceDMContext<ExpressionService>(this, "#expression");
> 
>         // Obtain a reference to the MIRunControl object that enables this service to
>         // communication with GDB using the MI protocol.
>@@ -234,7 +223,7 @@
>                         };
> 
>                     // Create an MIVarEvaluateExpression command and have GDB execute it.
>-                    DsfMIVarEvaluateExpression varEvalExpressionCmd = new DsfMIVarEvaluateExpression("expr"); //$NON-NLS-1$
>+                    DsfMIVarEvaluateExpression varEvalExpressionCmd = new DsfMIVarEvaluateExpression("expr");
> 
>                     fExpressionCache.execute(varEvalExpressionCmd, varEvalCallback);
>                 }
>@@ -242,7 +231,7 @@
> 
>         // Create an MIVarCreate command and have GDB execute it.
> 
>-        DsfMIVarCreate varCreateCmd = new DsfMIVarCreate(null, "expr", dmc.getExpression()); //$NON-NLS-1$
>+        DsfMIVarCreate varCreateCmd = new DsfMIVarCreate(null, "expr", dmc.getExpression());
> 
>         fExpressionCache.execute(varCreateCmd, varCreateCallback);
>     }
>@@ -347,7 +336,7 @@
>         @Override
>         public String toString()
>         {
>-            return baseToString() + ".expr[" + expression + "]"; //$NON-NLS-1$ //$NON-NLS-2$ $NON-NLS-2$
>+            return baseToString() + ".expr[" + expression + "]";
>         }
> 
>         /**
>@@ -439,7 +428,7 @@
>             rm.done();
>         } else {
>             rm.setStatus(new Status(IStatus.ERROR, DsfMIPlugin.PLUGIN_ID, -1,
>-                           "Unknown DMC type", null)); //$NON-NLS-1$
>+                           "Unknown DMC type", null));
>             rm.done();
>         }
>     }
>@@ -525,19 +514,19 @@
>     public void getBaseExpressions(IExpressionDMContext exprContext,
>                                    DataRequestMonitor<IExpressionDMContext[]> rm)
>     {
>-        rm.setStatus(new Status(IStatus.ERROR, DsfMIPlugin.PLUGIN_ID, NOT_SUPPORTED, "Not supported", null)); //$NON-NLS-1$
>+        rm.setStatus(new Status(IStatus.ERROR, DsfMIPlugin.PLUGIN_ID, NOT_SUPPORTED, "Not supported", null));
>         rm.done();  
>     }
> 
>     public void getSubExpressions(IExpressionDMContext exprCtx,
>                                   DataRequestMonitor<Iterable<IExpressionDMContext>> rm)
>     {
>-        rm.setStatus(new Status(IStatus.ERROR, DsfMIPlugin.PLUGIN_ID, NOT_SUPPORTED, "Not supported", null)); //$NON-NLS-1$
>+        rm.setStatus(new Status(IStatus.ERROR, DsfMIPlugin.PLUGIN_ID, NOT_SUPPORTED, "Not supported", null));
>         rm.done();  
>     }
> 
>     public void getAvailableFormattedValues(IFormattedDataDMContext<?> dmc, DataRequestMonitor<String[]> rm) {
>-        rm.setStatus(new Status(IStatus.ERROR, DsfMIPlugin.PLUGIN_ID, NOT_SUPPORTED, "Not supported", null)); //$NON-NLS-1$
>+        rm.setStatus(new Status(IStatus.ERROR, DsfMIPlugin.PLUGIN_ID, NOT_SUPPORTED, "Not supported", null));
>         rm.done();        
>     }
>

Flags:

pawel.1.piech: iplog+

Actions: View | Diff

Attachments on bug 186256: 66568 | 66914