indentation.

33 files changed, 52 insertions, 65 deletions

diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIArgumentObject.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIArgumentObject.java
index 30de9641109..5042c03eb74 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIArgumentObject.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIArgumentObject.java
@@ -8,5 +8,4 @@ package org.eclipse.cdt.debug.core.cdi;
 /**
  */
 public interface ICDIArgumentObject extends ICDIVariableObject {
-
 }
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIBreakpointHit.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIBreakpointHit.java
index e0ca33800e6..59729b11fdd 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIBreakpointHit.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIBreakpointHit.java
@@ -15,8 +15,7 @@ import org.eclipse.cdt.debug.core.cdi.model.ICDIBreakpoint;
  * 
  * @since Aug 27, 2002
  */
-public interface ICDIBreakpointHit extends ICDISessionObject
-{
+public interface ICDIBreakpointHit extends ICDISessionObject {
 	/**
 	 * Returns the breakpoint that stopped the program.
 	 * 
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDICatchEvent.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDICatchEvent.java
index 74547592dd9..0d385f7861e 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDICatchEvent.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDICatchEvent.java
@@ -12,7 +12,5 @@ package org.eclipse.cdt.debug.core.cdi;
  * 
  * @since Jul 9, 2002
  */
-public interface ICDICatchEvent
-{
-
+public interface ICDICatchEvent {
 }
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDICondition.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDICondition.java
index 9117269ff70..b5adfc6aa15 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDICondition.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDICondition.java
@@ -12,8 +12,7 @@ package org.eclipse.cdt.debug.core.cdi;
  * 
  * @since Jul 9, 2002
  */
-public interface ICDICondition
-{
+public interface ICDICondition {
 	/**
 	 * Returns the condition expression.
 	 * 
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIConfiguration.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIConfiguration.java
index 5484caea971..25a1fb04c20 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIConfiguration.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIConfiguration.java
@@ -11,8 +11,7 @@ package org.eclipse.cdt.debug.core.cdi;
  * 
  * @since Aug 6, 2002
  */
-public interface ICDIConfiguration
-{
+public interface ICDIConfiguration {
 	/**
 	 * Returns whether this session supports termination.
 	 * 
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIEndSteppingRange.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIEndSteppingRange.java
index 8999b1a7353..5d45278f658 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIEndSteppingRange.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIEndSteppingRange.java
@@ -12,6 +12,5 @@ package org.eclipse.cdt.debug.core.cdi;
  * 
  * @since Jul 10, 2002
  */
-public interface ICDIEndSteppingRange extends ICDISessionObject
-{
+public interface ICDIEndSteppingRange extends ICDISessionObject {
 }
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIErrorInfo.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIErrorInfo.java
index 56426680a93..32425b3edfe 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIErrorInfo.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIErrorInfo.java
@@ -17,10 +17,10 @@ public interface ICDIErrorInfo extends ICDISessionObject {
 	/**
 	 * Returns the error message.
 	 */
-	public String getMessage();
+	String getMessage();
 	
 	/**
 	 * Returns a more verbatim error message(if any).
 	 */
-	public String getDetailMessage();
+	String getDetailMessage();
 }
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIExitInfo.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIExitInfo.java
index 848d8626329..10d07543f78 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIExitInfo.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIExitInfo.java
@@ -13,12 +13,13 @@ package org.eclipse.cdt.debug.core.cdi;
  * 
  * @since Jul 10, 2002
  */
-public interface ICDIExitInfo extends ICDISessionObject
-{
+public interface ICDIExitInfo extends ICDISessionObject {
+
 	/**
 	 * Returns an exit code.
 	 * 
 	 * @return an exit code
 	 */
 	int getCode();
+
 }
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIWatchpointScope.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIWatchpointScope.java
index 05a1d202741..b8546eaccdb 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIWatchpointScope.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIWatchpointScope.java
@@ -14,8 +14,7 @@ import org.eclipse.cdt.debug.core.cdi.model.ICDIWatchpoint;
  * 
  * @since Aug 27, 2002
  */
-public interface ICDIWatchpointScope extends ICDISessionObject
-{
+public interface ICDIWatchpointScope extends ICDISessionObject {
 	/**
 	 * Returns the out of scope watchpoint.
 	 * 
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIWatchpointTrigger.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIWatchpointTrigger.java
index 5a2af67b592..0f0696bb6a6 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIWatchpointTrigger.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIWatchpointTrigger.java
@@ -14,8 +14,7 @@ import org.eclipse.cdt.debug.core.cdi.model.ICDIWatchpoint;
  * 
  * @since Aug 27, 2002
  */
-public interface ICDIWatchpointTrigger extends ICDISessionObject
-{
+public interface ICDIWatchpointTrigger extends ICDISessionObject {
 	/**
 	 * Returns the triggered watchpoint.
 	 * 
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIChangedEvent.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIChangedEvent.java
index 42cbeb33c90..ebc73339f6a 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIChangedEvent.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIChangedEvent.java
@@ -12,6 +12,5 @@ package org.eclipse.cdt.debug.core.cdi.event;
  * 
  * @since Jul 10, 2002
  */
-public interface ICDIChangedEvent extends ICDIEvent
-{
+public interface ICDIChangedEvent extends ICDIEvent {
 }
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDICreatedEvent.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDICreatedEvent.java
index 9ade3ece881..225a4e4cd06 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDICreatedEvent.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDICreatedEvent.java
@@ -17,6 +17,5 @@ package org.eclipse.cdt.debug.core.cdi.event;
  * 
  * @since Jul 10, 2002
  */
-public interface ICDICreatedEvent extends ICDIEvent
-{
+public interface ICDICreatedEvent extends ICDIEvent {
 }
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIDestroyedEvent.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIDestroyedEvent.java
index 910c9a76bdd..33a6b68f517 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIDestroyedEvent.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIDestroyedEvent.java
@@ -16,6 +16,5 @@ package org.eclipse.cdt.debug.core.cdi.event;
  * 
  * @since Jul 10, 2002
  */
-public interface ICDIDestroyedEvent extends ICDIEvent
-{
+public interface ICDIDestroyedEvent extends ICDIEvent {
 }
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIDisconnectedEvent.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIDisconnectedEvent.java
index f2643ace7ea..b64c1d2f7af 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIDisconnectedEvent.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIDisconnectedEvent.java
@@ -16,6 +16,5 @@ package org.eclipse.cdt.debug.core.cdi.event;
  * 
  * @since Jul 10, 2002
  */
-public interface ICDIDisconnectedEvent extends ICDIEvent
-{
+public interface ICDIDisconnectedEvent extends ICDIEvent {
 }
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIEvent.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIEvent.java
index f49e3046e4c..0ea528cc232 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIEvent.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIEvent.java
@@ -14,8 +14,7 @@ import org.eclipse.cdt.debug.core.cdi.model.ICDIObject;
  * 
  * @since Jul 18, 2002
  */
-public interface ICDIEvent
-{
+public interface ICDIEvent {
 	/**
 	 * The CDI object on which the event initially occurred.
 	 * 
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIEventListener.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIEventListener.java
index b066bc14e68..be9798d9459 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIEventListener.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIEventListener.java
@@ -13,8 +13,7 @@ package org.eclipse.cdt.debug.core.cdi.event;
  * 
  * @since Jul 10, 2002
  */
-public interface ICDIEventListener
-{
+public interface ICDIEventListener {
 	/**
 	 * Notifies this listener of the given event.
 	 * 
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIExitedEvent.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIExitedEvent.java
index 36628e46572..0a849a2cf11 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIExitedEvent.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIExitedEvent.java
@@ -17,8 +17,7 @@ import org.eclipse.cdt.debug.core.cdi.ICDIExitInfo;
  * 
  * @since Jul 10, 2002
  */
-public interface ICDIExitedEvent extends ICDIEvent
-{
+public interface ICDIExitedEvent extends ICDIEvent {
 	/**
 	 * Returns the information provided by the session when program 
 	 * is exited.
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIMemoryChangedEvent.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIMemoryChangedEvent.java
index a41804fe724..5a3a0cf5e74 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIMemoryChangedEvent.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIMemoryChangedEvent.java
@@ -10,8 +10,7 @@ package org.eclipse.cdt.debug.core.cdi.event;
  * Notifies that the originator has changed.
  *
  */
-public interface ICDIMemoryChangedEvent extends ICDIChangedEvent
-{
+public interface ICDIMemoryChangedEvent extends ICDIChangedEvent {
 	/**
 	 * @return the modified addresses.
 	 */
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIRestartedEvent.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIRestartedEvent.java
index 8b5e8387675..88067e2f3b0 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIRestartedEvent.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIRestartedEvent.java
@@ -16,6 +16,5 @@ package org.eclipse.cdt.debug.core.cdi.event;
  * 
  * @since Jul 11, 2002
  */
-public interface ICDIRestartedEvent extends ICDIEvent
-{
+public interface ICDIRestartedEvent extends ICDIEvent {
 }
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDISuspendedEvent.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDISuspendedEvent.java
index 5d9379bc898..64a25ac1731 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDISuspendedEvent.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDISuspendedEvent.java
@@ -26,8 +26,8 @@ import org.eclipse.cdt.debug.core.cdi.ICDISessionObject;
  * 
  * @since Jul 10, 2002
  */
-public interface ICDISuspendedEvent extends ICDIEvent
-{
+public interface ICDISuspendedEvent extends ICDIEvent {
+
 	/**
 	 * Returns the session object that caused the suspension.
 	 * 
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIBreakpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIBreakpoint.java
index 332909e3ee9..edd51c7444a 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIBreakpoint.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIBreakpoint.java
@@ -22,8 +22,7 @@ import org.eclipse.cdt.debug.core.cdi.ICDICondition;
  * 
  * @since Jul 9, 2002
  */
-public interface ICDIBreakpoint extends ICDIObject
-{
+public interface ICDIBreakpoint extends ICDIObject {
 	final static public int REGULAR = 0x0;
 	final static public int TEMPORARY = 0x1;
 	final static public int HARDWARE = 0x2;
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDICatchpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDICatchpoint.java
index ca758a9a183..6aa2f21db38 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDICatchpoint.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDICatchpoint.java
@@ -15,8 +15,7 @@ import org.eclipse.cdt.debug.core.cdi.ICDICatchEvent;
  * 
  * @since Jul 9, 2002
  */
-public interface ICDICatchpoint extends ICDIBreakpoint
-{
+public interface ICDICatchpoint extends ICDIBreakpoint {
 	/**
 	 * Returns the catch event for this catchpoint.
 	 * 
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIInstruction.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIInstruction.java
index f915ea439cc..50cdcbaac36 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIInstruction.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIInstruction.java
@@ -12,8 +12,7 @@ package org.eclipse.cdt.debug.core.cdi.model;
  * 
  * @since Jul 10, 2002
  */
-public interface ICDIInstruction extends ICDIObject
-{
+public interface ICDIInstruction extends ICDIObject {
 	/**
 	 *  Returns the Address.
 	 * @return the address.
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDILocationBreakpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDILocationBreakpoint.java
index 00959930add..d70d05b5e13 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDILocationBreakpoint.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDILocationBreakpoint.java
@@ -15,8 +15,7 @@ import org.eclipse.cdt.debug.core.cdi.ICDILocation;
  * 
  * @since Jul 9, 2002
  */
-public interface ICDILocationBreakpoint extends ICDIBreakpoint
-{
+public interface ICDILocationBreakpoint extends ICDIBreakpoint {
 	/**
 	 * Returns the location of this breakpoint.
 	 * 
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIMemoryBlock.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIMemoryBlock.java
index 4c38a213d75..7a14723e483 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIMemoryBlock.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIMemoryBlock.java
@@ -15,8 +15,7 @@ import org.eclipse.cdt.debug.core.cdi.CDIException;
  * 
  * @since Jul 18, 2002
  */
-public interface ICDIMemoryBlock extends ICDIObject
-{
+public interface ICDIMemoryBlock extends ICDIObject {
 	/**
 	 * Returns the start address of this memory block.
 	 * 
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIObject.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIObject.java
index ab74cf66ee5..a9a6a2860bd 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIObject.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIObject.java
@@ -11,8 +11,7 @@ package org.eclipse.cdt.debug.core.cdi.model;
  * 
  * @since Jul 8, 2002
  */
-public interface ICDIObject
-{
+public interface ICDIObject {
 	/**
 	 * Returns the target this object is contained in.
 	 * 
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIPointerValue.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIPointerValue.java
index 13c5f3e76ab..9a4ab5bc537 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIPointerValue.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIPointerValue.java
@@ -11,7 +11,5 @@ package org.eclipse.cdt.debug.core.cdi.model;
  * 
  * @since Aug 9, 2002
  */
-public interface ICDIPointerValue extends ICDIValue
-{
-
+public interface ICDIPointerValue extends ICDIValue {
 }
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIRegisterGroup.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIRegisterGroup.java
index 11215adca2b..185541c5890 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIRegisterGroup.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIRegisterGroup.java
@@ -14,8 +14,7 @@ import org.eclipse.cdt.debug.core.cdi.CDIException;
  * 
  * @since Jul 9, 2002
  */
-public interface ICDIRegisterGroup extends ICDIObject
-{
+public interface ICDIRegisterGroup extends ICDIObject {
 	/**
 	 * Returns the registers in this register group.
 	 * 
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIStackFrame.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIStackFrame.java
index 7325e7aaf23..ae7d6fee77c 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIStackFrame.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIStackFrame.java
@@ -17,8 +17,7 @@ import org.eclipse.cdt.debug.core.cdi.ICDILocation;
  * 
  * @since Jul 8, 2002
  */
-public interface ICDIStackFrame extends ICDIObject
-{
+public interface ICDIStackFrame extends ICDIObject {
 	/**
 	 * Returns the location of the instruction pointer in this 
 	 * stack frame.
@@ -46,6 +45,13 @@ public interface ICDIStackFrame extends ICDIObject
 	ICDIArgument[] getArguments() throws CDIException;
 
 	/**
+	 * Returns the thread this stackframe is contained in.
+	 *  
+	 * @return the thread
+	 */
+	ICDIThread getThread();
+
+	/**
 	 * Returns the level of the stack frame.
 	 * 
 	 * @return the level of the stack frame 
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIStaticVariable.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIStaticVariable.java
index 08300ffb9cf..52b43d5123f 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIStaticVariable.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIStaticVariable.java
@@ -12,6 +12,5 @@ package org.eclipse.cdt.debug.core.cdi.model;
  * 
  * @since Jul 9, 2002
  */
-public interface ICDIStaticVariable extends ICDIVariable
-{
+public interface ICDIStaticVariable extends ICDIVariable {
 }
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIValue.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIValue.java
index 058af5cd15c..667a6c2f1f3 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIValue.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIValue.java
@@ -15,8 +15,7 @@ import org.eclipse.cdt.debug.core.cdi.CDIException;
  * 
  * @since Jul 9, 2002
  */
-public interface ICDIValue extends ICDIObject
-{
+public interface ICDIValue extends ICDIObject {
 	/**
 	 * Returns a description of the type of data this value contains.
 	 * 
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 7c57b5324fa..acf1d953749 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
@@ -16,6 +16,16 @@ import org.eclipse.cdt.debug.core.cdi.CDIException;
  * @since Jul 9, 2002
  */
 public interface ICDIVariable extends ICDIObject {
+
+	/**
+	 * 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.
 	 * 
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIWatchpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIWatchpoint.java
index 0058fbfb7b1..6364c4b06a7 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIWatchpoint.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIWatchpoint.java
@@ -14,8 +14,7 @@ import org.eclipse.cdt.debug.core.cdi.CDIException;
  * 
  * @since Jul 9, 2002
  */
-public interface ICDIWatchpoint extends ICDIBreakpoint
-{
+public interface ICDIWatchpoint extends ICDIBreakpoint {
 	final static public int WRITE = 0x1;
 	final static public int READ = 0x2;