From de21ec720818681d2b5fd21590a98dd4370c1bb1 Mon Sep 17 00:00:00 2001
From: Alain Magloire <alain@qnx.com>
Date: Wed, 6 Aug 2003 19:51:58 +0000
Subject: [PATCH] Move methods to ICDIVariableObject.

---
 .../debug/core/cdi/model/ICDIVariable.java    | 34 ----------------
 .../core/cdi/model/ICDIVariableObject.java    | 39 +++++++++++++++++--
 2 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIVariable.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIVariable.java
index 5fb407984fa..575161a2468 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIVariable.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIVariable.java
@@ -7,7 +7,6 @@
 package org.eclipse.cdt.debug.core.cdi.model;
 
 import org.eclipse.cdt.debug.core.cdi.CDIException;
-import org.eclipse.cdt.debug.core.cdi.model.type.ICDIType;
 
 /**
  * 
@@ -18,39 +17,6 @@ import org.eclipse.cdt.debug.core.cdi.model.type.ICDIType;
  */
 public interface ICDIVariable extends ICDIVariableObject {
 
-	
-	/**
-	 * Returns the stackframe where the variable was found
-	 * may return null.
-	 * 
-	 * @return the stackframe
-	 * @throws CDIException if this method fails.  Reasons include:
-	 */
-	ICDIStackFrame getStackFrame() throws CDIException;
-
-	/**
-	 * Returns the name of this variable.
-	 * 
-	 * @return the name of this variable
-	 * @throws CDIException if this method fails.  Reasons include:
-	 */
-	String getName();
-
-	/**
-	 * Returns the type of data this variable is declared.
-	 * 
-	 * @return the type of data this variable is declared
-	 * @throws CDIException if this method fails.  Reasons include:
-	 */
-	String getTypeName() throws CDIException;
-
-	/**
-	 * Returns the type of data this variable is declared.
-	 * 
-	 * @return the type of data this variable is declared
-	 * @throws CDIException if this method fails.  Reasons include:
-	 */
-	ICDIType getType() throws CDIException;
 
 	/**
 	 * Returns the value of this variable.
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIVariableObject.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIVariableObject.java
index 2bb0d6f47cd..6796b3dd78a 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIVariableObject.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIVariableObject.java
@@ -6,6 +6,9 @@
 
 package org.eclipse.cdt.debug.core.cdi.model;
 
+import org.eclipse.cdt.debug.core.cdi.CDIException;
+import org.eclipse.cdt.debug.core.cdi.model.type.ICDIType;
+
 
 /**
  * 
@@ -13,9 +16,39 @@ package org.eclipse.cdt.debug.core.cdi.model;
 public interface ICDIVariableObject extends ICDIObject {
 
 	/**
-	 * Method getName.
-	 * @return String
+	 * Returns the name of this variable.
+	 * 
+	 * @return String the name of this variable
 	 */
-	public String getName();
+	String getName();
+	
+	/**
+	 * Returns the stackframe where the variable was found
+	 * may return null.
+	 * 
+	 * @return the stackframe
+	 * @throws CDIException if this method fails.  Reasons include:
+	 */
+	ICDIStackFrame getStackFrame() throws CDIException;
 
+	/**
+	 * Returns the type of data this variable is declared.
+	 * 
+	 * @return the type of data this variable is declared
+	 * @throws CDIException if this method fails.  Reasons include:
+	 */
+	ICDIType getType() throws CDIException;
+	
+	/**
+	 * Returns the type of data this variable is declared.
+	 * 
+	 * @return the type of data this variable is declared
+	 * @throws CDIException if this method fails.  Reasons include:
+	 */
+	String getTypeName() throws CDIException;
+
+	/**
+	 * @return
+	 */
+	//int sizeof() throws CDIException;
 }