[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
[cdt-patch] mi.core frameworks
|
Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.mi.core/ChangeLog,v
retrieving revision 1.105
diff -u -r1.105 ChangeLog
--- ChangeLog 13 Mar 2003 21:11:18 -0000 1.105
+++ ChangeLog 14 Mar 2003 16:21:51 -0000
@@ -1,3 +1,14 @@
+2003-03-14 Alain Magloire
+
+ * src/org/eclipse/cdt/debug/mi/core/cdi/model/Argument.java:
+ New method getArgumentObject().
+ * src/org/eclipse/cdt/debug/mi/core/cdi/model/Register.java:
+ New method getRegisterObject().
+ * src/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java:
+ Checks for ICDIVariable and ICDIArgument since they are now ICDIVariableObject too.
+ * src/org/eclipse/cdt/debug/mi/core/cdi/RegisterManager.java:
+ Checks for ICDIRegister when creating since they are now ICDIRegisterObject too.
+
2003-03-13 Alain Magloire
Small bug fix
Index: src/org/eclipse/cdt/debug/mi/core/cdi/RegisterManager.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/RegisterManager.java,v
retrieving revision 1.9
diff -u -r1.9 RegisterManager.java
--- src/org/eclipse/cdt/debug/mi/core/cdi/RegisterManager.java 9 Feb 2003 22:17:37 -0000 1.9
+++ src/org/eclipse/cdt/debug/mi/core/cdi/RegisterManager.java 14 Mar 2003 16:21:51 -0000
@@ -71,8 +71,13 @@
* @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#createRegister()
*/
public ICDIRegister createRegister(ICDIRegisterObject regObject) throws CDIException {
+ RegisterObject regObj = null;
if (regObject instanceof RegisterObject) {
- RegisterObject regObj = (RegisterObject)regObject;
+ regObj = (RegisterObject)regObject;
+ } else if (regObject instanceof Register) {
+ regObj = ((Register)regObject).getRegisterObject();
+ }
+ if (regObj != null) {
Register reg = getRegister(regObject);
if (reg == null) {
try {
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.26
diff -u -r1.26 VariableManager.java
--- src/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java 13 Mar 2003 21:11:08 -0000 1.26
+++ src/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java 14 Mar 2003 16:21:51 -0000
@@ -145,8 +145,13 @@
* @see org.eclipse.cdt.debug.core.cdi.ICDIVariableManager#createArgument(ICDIArgumentObject)
*/
public ICDIArgument createArgument(ICDIArgumentObject a) throws CDIException {
+ ArgumentObject argObj = null;
if (a instanceof ArgumentObject) {
- ArgumentObject argObj = (ArgumentObject)a;
+ argObj = (ArgumentObject)a;
+ } else if (a instanceof Argument) {
+ argObj = ((Argument)a).getArgumentObject();
+ }
+ if (argObj != null) {
Variable variable = findVariable(argObj);
Argument argument = null;
if (variable != null && variable instanceof Argument) {
@@ -287,8 +292,13 @@
* @see org.eclipse.cdt.debug.core.cdi.ICDIVariableManager#getVariableObjectAsArray(ICDIVariableObject, String, int, int)
*/
public ICDIVariableObject getVariableObjectAsArray(ICDIVariableObject object, String type, int start, int end) throws CDIException {
+ VariableObject obj = null;
if (object instanceof VariableObject) {
- VariableObject obj = (VariableObject)object;
+ obj = (VariableObject)object;
+ } else if (object instanceof Variable) {
+ obj = ((Variable)object).getVariableObject();
+ }
+ if (obj != null) {
StringBuffer buffer = new StringBuffer();
buffer.append("*(");
buffer.append('(');
@@ -324,8 +334,13 @@
* @see org.eclipse.cdt.debug.core.cdi.ICDIVariableManager#getVariableObjectAsArray(ICDIVariableObject, String, int, int)
*/
public ICDIVariableObject getVariableObjectAsType(ICDIVariableObject object, String type) throws CDIException {
+ VariableObject obj = null;
if (object instanceof VariableObject) {
- VariableObject obj = (VariableObject)object;
+ obj = (VariableObject)object;
+ } else if (object instanceof Variable) {
+ obj = ((Variable)object).getVariableObject();
+ }
+ if (obj != null) {
StringBuffer buffer = new StringBuffer();
if (type != null && type.length() > 0) {
// Check if the type is valid.
@@ -405,8 +420,14 @@
* @see org.eclipse.cdt.debug.core.cdi.ICDIVariableManager#createVariable(ICDIVariableObject)
*/
public ICDIVariable createVariable(ICDIVariableObject v) throws CDIException {
+ VariableObject varObj = null;
if (v instanceof VariableObject) {
- VariableObject varObj = (VariableObject)v;
+ varObj = (VariableObject)v;
+ }
+ if (v instanceof Variable) {
+ varObj = ((Variable)v).getVariableObject();
+ }
+ if (varObj != null) {
Variable variable = findVariable(varObj);
if (variable == null) {
String name = varObj.getName();
Index: src/org/eclipse/cdt/debug/mi/core/cdi/model/Argument.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/Argument.java,v
retrieving revision 1.3
diff -u -r1.3 Argument.java
--- src/org/eclipse/cdt/debug/mi/core/cdi/model/Argument.java 27 Jan 2003 16:15:43 -0000 1.3
+++ src/org/eclipse/cdt/debug/mi/core/cdi/model/Argument.java 14 Mar 2003 16:21:51 -0000
@@ -14,4 +14,8 @@
public Argument(ArgumentObject obj, MIVar var) {
super(obj, var);
}
+
+ public ArgumentObject getArgumentObject() {
+ return (ArgumentObject)super.getVariableObject();
+ }
}
Index: src/org/eclipse/cdt/debug/mi/core/cdi/model/Register.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/Register.java,v
retrieving revision 1.6
diff -u -r1.6 Register.java
--- src/org/eclipse/cdt/debug/mi/core/cdi/model/Register.java 9 Feb 2003 22:16:24 -0000 1.6
+++ src/org/eclipse/cdt/debug/mi/core/cdi/model/Register.java 14 Mar 2003 16:21:51 -0000
@@ -25,6 +25,10 @@
super(obj, var);
}
+ public RegisterObject getRegisterObject() {
+ return (RegisterObject)super.getVariableObject();
+ }
+
/**
* @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariable#getValue()
*/
