[cdt-patch] MI/Core

["Alain Magloire" <alain@xxxxxxx>]

Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.mi.core/ChangeLog,v
retrieving revision 1.156
diff -u -r1.156 ChangeLog
--- ChangeLog	7 Aug 2003 15:57:17 -0000	1.156
+++ ChangeLog	8 Aug 2003 01:56:09 -0000
@@ -1,3 +1,8 @@
+2003-08-07 Alain Magloire
+
+	* src/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java:
+	Update the interface to reflect ICDIVariableManager.
+
 2003-08-06 Mikhail Khodjaiants
 	* src/org/eclipse/cdt/debug/mi/core/cdi/model/type/ArrayValue.java:
 	Removed the unused local variable 'children' from the 'getVariables' method.
Index: src/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java,v
retrieving revision 1.36
diff -u -r1.36 VariableManager.java
--- src/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java	7 Aug 2003 03:29:12 -0000	1.36
+++ src/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java	8 Aug 2003 01:56:10 -0000
@@ -224,19 +224,6 @@
 	}
 
 	/**
-	 * @see org.eclipse.cdt.debug.core.cdi.ICDIVariableManager#getArgumentObject(ICDIStackFrame, String)
-	 */
-	public ICDIArgumentObject getArgumentObject(ICDIStackFrame stack, String name) throws CDIException {
-		ICDIArgumentObject[] argsObjects = getArgumentObjects(stack);
-		for (int i = 0; i < argsObjects.length; i++) {
-			if (argsObjects[i].getName().equals(name)) {
-				return argsObjects[i];
-			}
-		}
-		return null;
-	}
-
-	/**
 	 * @see org.eclipse.cdt.debug.core.cdi.ICDIVariableManager#getArgumentObjects(ICDIStackFrame)
 	 */
 	public ICDIArgumentObject[] getArgumentObjects(ICDIStackFrame frame) throws CDIException {
@@ -280,22 +267,9 @@
 	}
 
 	/**
-	 * @see org.eclipse.cdt.debug.core.cdi.ICDIVariableManager#getVariableObject(ICDIStackFrame, String)
-	 */
-	public ICDIVariableObject getVariableObject(ICDIStackFrame stack, String name) throws CDIException {
-		ICDIVariableObject[] varObjects = getVariableObjects(stack);
-		for (int i = 0; i < varObjects.length; i++) {
-			if (varObjects[i].getName().equals(name)) {
-				return varObjects[i];
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.cdt.debug.core.cdi.ICDIVariableManager#getVariableObject(String, String, String)
+	 * @see org.eclipse.cdt.debug.core.cdi.ICDIVariableManager#getGlobalVariableObject(String, String, String)
 	 */
-	public ICDIVariableObject getVariableObject(String filename, String function, String name) throws CDIException {
+	public ICDIVariableObject getGlobalVariableObject(String filename, String function, String name) throws CDIException {
 		if (filename == null) {
 			filename = new String();
 		}
Index: src/org/eclipse/cdt/debug/mi/core/cdi/model/VariableObject.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/VariableObject.java,v
retrieving revision 1.9
diff -u -r1.9 VariableObject.java
--- src/org/eclipse/cdt/debug/mi/core/cdi/model/VariableObject.java	7 Aug 2003 03:32:15 -0000	1.9
+++ src/org/eclipse/cdt/debug/mi/core/cdi/model/VariableObject.java	8 Aug 2003 01:56:10 -0000
@@ -126,12 +126,12 @@
 		StringBuffer buffer = new StringBuffer();
 		if (castingLength > 0 || castingIndex > 0) {
 			buffer.append("(");
-			//buffer.append('(');
+			buffer.append('(');
 			if (castingType != null && castingType.length() > 0) {
 				buffer.append('(').append(castingType).append(')');
 			}
 			buffer.append(getName());
-			//buffer.append(')');
+			buffer.append(')');
 			if (castingIndex != 0) {
 					buffer.append('+').append(castingIndex);
 			}