Do not use {g,s}etCurrentTarget() if possible. code

marked as depracated

6 files changed, 21 insertions, 45 deletions

diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/RegisterManager.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/RegisterManager.java
index 4feea8ca077..a82a8e38e5f 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/RegisterManager.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/RegisterManager.java
@@ -69,8 +69,6 @@ public class RegisterManager extends Manager implements ICDIRegisterManager {
 	}
 	public ICDIRegisterObject[] getRegisterObjects(Target target) throws CDIException {
 		Session session = (Session)getSession();
-		Target currentTarget = session.getCurrentTarget();
-		session.setCurrentTarget(target);
 		MISession mi = target.getMISession();
 		CommandFactory factory = mi.getCommandFactory();
 		MIDataListRegisterNames registers = factory.createMIDataListRegisterNames();
@@ -92,7 +90,6 @@ public class RegisterManager extends Manager implements ICDIRegisterManager {
 		} catch (MIException e) {
 			throw new MI2CDIException(e);
 		} finally {
-			session.setCurrentTarget(currentTarget);
 		}
 	}
 
diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/Session.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/Session.java
index d0cc5c671e4..9d502618f64 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/Session.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/Session.java
@@ -103,6 +103,10 @@ public class Session implements ICDISession, ICDISessionObject {
 		return pMgr.getTarget(miSession);
 	}
 
+	/**
+	 * @deprecated
+	 * @return
+	 */
 	public Target getCurrentTarget() {
 		ProcessManager pMgr = getProcessManager();
 		return pMgr.getCurrentTarget();
@@ -191,15 +195,15 @@ public class Session implements ICDISession, ICDISessionObject {
 	}
 
 	/**
+	 * @deprecated
 	 * @see org.eclipse.cdt.debug.core.cdi.ICDISession#setCurrentTarget()
 	 */
 	public void setCurrentTarget(Target target) throws CDIException {
 		ProcessManager pMgr = getProcessManager();
 		pMgr.setCurrentTarget(target);
-//		throw new CDIException(CdiResources.getString("cdi.Session.Unknown_target")); //$NON-NLS-1$
 	}
 
-	/**
+		/**
 	 * @see org.eclipse.cdt.debug.core.cdi.ICDISession#setAttribute(String, String)
 	 */
 	public void setAttribute(String key, String value) {
diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SourceManager.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SourceManager.java
index 7ff0fd0782a..7735a66cc77 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SourceManager.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SourceManager.java
@@ -457,11 +457,9 @@ public class SourceManager extends Manager implements ICDISourceManager {
 
 	public String getDetailTypeName(ICDIStackFrame frame, String typename) throws CDIException {
 		Session session = (Session)getSession();
-		Target currentTarget = session.getCurrentTarget();
-		ICDIThread currentThread = currentTarget.getCurrentThread();
-		ICDIStackFrame currentFrame = currentThread.getCurrentStackFrame();
 		Target target = (Target)frame.getTarget();
-		session.setCurrentTarget(target);
+		ICDIThread currentThread = target.getCurrentThread();
+		ICDIStackFrame currentFrame = currentThread.getCurrentStackFrame();
 		target.setCurrentThread(frame.getThread(), false);
 		frame.getThread().setCurrentStackFrame(frame, false);
 		try {
@@ -477,7 +475,6 @@ public class SourceManager extends Manager implements ICDISourceManager {
 		} catch (MIException e) {
 			throw new MI2CDIException(e);
 		} finally {
-			session.setCurrentTarget(currentTarget);
 			target.setCurrentThread(currentThread, false);
 			currentThread.setCurrentStackFrame(currentFrame, false);
 		}
@@ -487,13 +484,11 @@ public class SourceManager extends Manager implements ICDISourceManager {
 		Session session = (Session)getSession();
 		ICDIStackFrame frame = vo.getStackFrame();
 		Target target = (Target)vo.getTarget();
-		Target currentTarget = session.getCurrentTarget();
 		ICDIThread currentThread = null;
 		ICDIStackFrame currentFrame = null;
 		if (frame != null) {
-			currentThread = currentTarget.getCurrentThread();
+			currentThread = target.getCurrentThread();
 			currentFrame = currentThread.getCurrentStackFrame();
-			session.setCurrentTarget(target);
 			target.setCurrentThread(frame.getThread(), false);
 			frame.getThread().setCurrentStackFrame(frame, false);
 		}
@@ -510,7 +505,6 @@ public class SourceManager extends Manager implements ICDISourceManager {
 		} catch (MIException e) {
 			throw new MI2CDIException(e);
 		} finally {
-			session.setCurrentTarget(currentTarget);
 			if (currentThread != null) {
 				target.setCurrentThread(currentThread, false);
 			}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java
index 771e0b9fcc6..613117367bb 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java
@@ -151,11 +151,9 @@ public class VariableManager extends Manager implements ICDIVariableManager {
 	public void checkType(StackFrame frame, String type) throws CDIException {
 		if (type != null && type.length() > 0) {
 			Session session = (Session)getSession();
-			Target currentTarget = session.getCurrentTarget();
-			ICDIThread currentThread = currentTarget.getCurrentThread();
-			ICDIStackFrame currentFrame = currentThread.getCurrentStackFrame();
 			Target target = (Target)frame.getTarget();
-			session.setCurrentTarget(target);
+			ICDIThread currentThread = target.getCurrentThread();
+			ICDIStackFrame currentFrame = currentThread.getCurrentStackFrame();
 			target.setCurrentThread(frame.getThread(), false);
 			frame.getThread().setCurrentStackFrame(frame, false);
 			try {
@@ -170,7 +168,6 @@ public class VariableManager extends Manager implements ICDIVariableManager {
 			} catch (MIException e) {
 				throw new MI2CDIException(e);
 			} finally {
-				session.setCurrentTarget(currentTarget);
 				target.setCurrentThread(currentThread, false);
 				currentThread.setCurrentStackFrame(currentFrame, false);
 			}
@@ -236,9 +233,8 @@ public class VariableManager extends Manager implements ICDIVariableManager {
 				ICDIThread currentThread = null;
 				ICDIStackFrame currentFrame = null;
 				Target target = (Target)argObj.getTarget();
-				Target currentTarget = session.getCurrentTarget();
 				if (stack != null) {
-					currentThread = currentTarget.getCurrentThread();
+					currentThread = target.getCurrentThread();
 					currentFrame = currentThread.getCurrentStackFrame();
 					target.setCurrentThread(stack.getThread(), false);
 					stack.getThread().setCurrentStackFrame(stack, false);
@@ -258,7 +254,6 @@ public class VariableManager extends Manager implements ICDIVariableManager {
 				} catch (MIException e) {
 					throw new MI2CDIException(e);
 				} finally {
-					session.setCurrentTarget(currentTarget);
 					if (currentThread != null) {
 						target.setCurrentThread(currentThread, false);
 						currentThread.setCurrentStackFrame(currentFrame, false);
@@ -276,10 +271,9 @@ public class VariableManager extends Manager implements ICDIVariableManager {
 	public ICDIArgumentObject[] getArgumentObjects(ICDIStackFrame frame) throws CDIException {
 		List argObjects = new ArrayList();
 		Session session = (Session) getSession();
-		Target currentTarget = session.getCurrentTarget();
-		ICDIThread currentThread = currentTarget.getCurrentThread();
-		ICDIStackFrame currentFrame = currentThread.getCurrentStackFrame();
 		Target target = (Target)frame.getTarget();
+		ICDIThread currentThread = target.getCurrentThread();
+		ICDIStackFrame currentFrame = currentThread.getCurrentStackFrame();
 		target.setCurrentThread(frame.getThread(), false);
 		frame.getThread().setCurrentStackFrame(frame, false);
 		try {
@@ -309,7 +303,6 @@ public class VariableManager extends Manager implements ICDIVariableManager {
 		} catch (MIException e) {
 			throw new MI2CDIException(e);
 		} finally {
-			session.setCurrentTarget(currentTarget);
 			target.setCurrentThread(currentThread, false);
 			currentThread.setCurrentStackFrame(currentFrame, false);
 		}
@@ -406,10 +399,9 @@ public class VariableManager extends Manager implements ICDIVariableManager {
 	public ICDIVariableObject[] getLocalVariableObjects(ICDIStackFrame frame) throws CDIException {
 		List varObjects = new ArrayList();
 		Session session = (Session) getSession();
-		Target currentTarget = session.getCurrentTarget();
-		ICDIThread currentThread = currentTarget.getCurrentThread();
-		ICDIStackFrame currentFrame = currentThread.getCurrentStackFrame();
 		Target target = (Target)frame.getTarget();
+		ICDIThread currentThread = target.getCurrentThread();
+		ICDIStackFrame currentFrame = currentThread.getCurrentStackFrame();
 		target.setCurrentThread(frame.getThread(), false);
 		frame.getThread().setCurrentStackFrame(frame, false);
 		try {
@@ -433,7 +425,6 @@ public class VariableManager extends Manager implements ICDIVariableManager {
 		} catch (MIException e) {
 			throw new MI2CDIException(e);
 		} finally {
-			session.setCurrentTarget(currentTarget);
 			target.setCurrentThread(currentThread, false);
 			currentThread.setCurrentStackFrame(currentFrame, false);
 		}
@@ -469,9 +460,8 @@ public class VariableManager extends Manager implements ICDIVariableManager {
 				ICDIThread currentThread = null;
 				ICDIStackFrame currentFrame = null;
 				Target target = (Target)varObj.getTarget();
-				Target currentTarget = session.getCurrentTarget();
 				if (stack != null) {
-					currentThread = currentTarget.getCurrentThread();
+					currentThread = target.getCurrentThread();
 					currentFrame = currentThread.getCurrentStackFrame();
 					target.setCurrentThread(stack.getThread(), false);
 					stack.getThread().setCurrentStackFrame(stack, false);
@@ -491,7 +481,6 @@ public class VariableManager extends Manager implements ICDIVariableManager {
 				} catch (MIException e) {
 					throw new MI2CDIException(e);
 				} finally {
-					session.setCurrentTarget(currentTarget);
 					if (currentThread != null) {
 						target.setCurrentThread(currentThread, false);
 						currentThread.setCurrentStackFrame(currentFrame, false);
diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Expression.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Expression.java
index 375e57b5a39..e064c740abd 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Expression.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Expression.java
@@ -79,11 +79,9 @@ public class Expression extends CObject implements ICDIExpression {
 
 	protected Variable createVariable(ICDIStackFrame frame) throws CDIException {
 		Session session = (Session)getTarget().getSession();
-		Target currentTarget = session.getCurrentTarget();
-		ICDIThread currentThread = currentTarget.getCurrentThread();
-		ICDIStackFrame currentFrame = currentThread.getCurrentStackFrame();
 		Target target = (Target)frame.getTarget();
-		session.setCurrentTarget(target);
+		ICDIThread currentThread = target.getCurrentThread();
+		ICDIStackFrame currentFrame = currentThread.getCurrentStackFrame();
 		target.setCurrentThread(frame.getThread(), false);
 		frame.getThread().setCurrentStackFrame(frame, false);
 		try {
@@ -100,7 +98,6 @@ public class Expression extends CObject implements ICDIExpression {
 		} catch (MIException e) {
 			throw new MI2CDIException(e);
 		} finally {
-			session.setCurrentTarget(currentTarget);
 			target.setCurrentThread(currentThread, false);
 			currentThread.setCurrentStackFrame(currentFrame, false);
 		}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java
index f470fceab61..9a33a85ed3b 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java
@@ -116,8 +116,6 @@ public class Target  implements ICDITarget {
 	/**
 	 */
 	public void setCurrentThread(Thread cthread, boolean doUpdate) throws CDIException {
-		// set us as the current target.
-		session.setCurrentTarget(this);
 
 		int id = cthread.getId();
 		// No need to set thread id 0, it is a dummy thread.
@@ -629,11 +627,9 @@ public class Target  implements ICDITarget {
 
 	public String evaluateExpressionToString(ICDIStackFrame frame, String expressionText) throws CDIException {
 		Session session = (Session)getSession();
-		Target currentTarget = session.getCurrentTarget();
-		ICDIThread currentThread = currentTarget.getCurrentThread();
-		ICDIStackFrame currentFrame = currentThread.getCurrentStackFrame();
 		Target target = (Target)frame.getTarget();
-		session.setCurrentTarget(target);
+		ICDIThread currentThread = target.getCurrentThread();
+		ICDIStackFrame currentFrame = currentThread.getCurrentStackFrame();
 		target.setCurrentThread(frame.getThread(), false);
 		frame.getThread().setCurrentStackFrame(frame, false);
 		try {
@@ -650,7 +646,6 @@ public class Target  implements ICDITarget {
 		} catch (MIException e) {
 			throw new MI2CDIException(e);
 		} finally {
-			session.setCurrentTarget(currentTarget);
 			target.setCurrentThread(currentThread, false);
 			currentThread.setCurrentStackFrame(currentFrame, false);
 		}