diff --git a/debug/org.eclipse.cdt.debug.core/.classpath b/debug/org.eclipse.cdt.debug.core/.classpath index 2a63a6d3792..cad3c8f8f8e 100644 --- a/debug/org.eclipse.cdt.debug.core/.classpath +++ b/debug/org.eclipse.cdt.debug.core/.classpath @@ -5,6 +5,6 @@ - + diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugModel.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugModel.java index 82fcfaedbae..d909f92d316 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugModel.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugModel.java @@ -6,7 +6,7 @@ package org.eclipse.cdt.debug.core; -import org.eclipse.cdt.debug.core.cdi.model.ICTarget; +import org.eclipse.cdt.debug.core.cdi.model.ICDITarget; import org.eclipse.cdt.debug.internal.core.CDebugTarget; import org.eclipse.core.resources.IWorkspaceRunnable; import org.eclipse.core.resources.ResourcesPlugin; @@ -69,7 +69,7 @@ public class CDebugModel * @since 2.0 */ public static IDebugTarget newDebugTarget( final ILaunch launch, - final ICTarget cdiTarget, + final ICDITarget cdiTarget, final String name, final IProcess process, final boolean allowTerminate, diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICBreakpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIBreakpoint.java similarity index 88% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICBreakpoint.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIBreakpoint.java index a75a1bddd69..7e194548fb4 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICBreakpoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIBreakpoint.java @@ -13,13 +13,13 @@ package org.eclipse.cdt.debug.core.cdi; * basic functionality for the location breakpoints, watchpoints, * and catchpoints. * - * @see ICLocationBreakpoint - * @see ICWatchpoint - * @see ICCatchpoint + * @see ICDILocationBreakpoint + * @see ICDIWatchpoint + * @see ICDICatchpoint * * @since Jul 9, 2002 */ -public interface ICBreakpoint extends ICSessionObject +public interface ICDIBreakpoint extends ICDISessionObject { final static public int REGULAR = 0x0; final static public int TEMPORARY = 0x1; @@ -64,7 +64,7 @@ public interface ICBreakpoint extends ICSessionObject * @return the condition of this breakpoint * @throws CDIException if this method fails. Reasons include: */ - ICCondition getCondition() throws CDIException; + ICDICondition getCondition() throws CDIException; /** * Sets the condition of this breakpoint. @@ -72,7 +72,7 @@ public interface ICBreakpoint extends ICSessionObject * @param the condition to set * @throws CDIException if this method fails. Reasons include: */ - void setCondition( ICCondition condition ) throws CDIException; + void setCondition( ICDICondition condition ) throws CDIException; /** * Returns a thread identifier or null is the breakpoint diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICBreakpointManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIBreakpointManager.java similarity index 77% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICBreakpointManager.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIBreakpointManager.java index 3e0295a4560..4d79d7f74e7 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICBreakpointManager.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIBreakpointManager.java @@ -12,7 +12,7 @@ package org.eclipse.cdt.debug.core.cdi; * * @since Jul 9, 2002 */ -public interface ICBreakpointManager extends ICSessionObject +public interface ICDIBreakpointManager extends ICDISessionObject { /** * Returns a collection of all breakpoints set for this session. @@ -21,7 +21,7 @@ public interface ICBreakpointManager extends ICSessionObject * @return a collection of all breakpoints set for this session * @throws CDIException on failure. Reasons include: */ - ICBreakpoint[] getBreakpoints() throws CDIException; + ICDIBreakpoint[] getBreakpoints() throws CDIException; /** * Deletes the given breakpoint. @@ -29,7 +29,7 @@ public interface ICBreakpointManager extends ICSessionObject * @param breakpoint - a breakpoint to be deleted * @throws CDIException on failure. Reasons include: */ - void deleteBreakpoint( ICBreakpoint breakpoint ) throws CDIException; + void deleteBreakpoint( ICDIBreakpoint breakpoint ) throws CDIException; /** * Deletes the given array of breakpoints. @@ -37,7 +37,7 @@ public interface ICBreakpointManager extends ICSessionObject * @param breakpoints - the array of breakpoints to be deleted * @throws CDIException on failure. Reasons include: */ - void deleteBreakpoints( ICBreakpoint[] breakpoints ) throws CDIException; + void deleteBreakpoints( ICDIBreakpoint[] breakpoints ) throws CDIException; /** * Deletes all breakpoints. @@ -57,9 +57,9 @@ public interface ICBreakpointManager extends ICSessionObject * @return a breakpoint * @throws CDIException on failure. Reasons include: */ - ICLocationBreakpoint setLocationBreakpoint( int type, - ICLocation location, - ICCondition condition, + ICDILocationBreakpoint setLocationBreakpoint( int type, + ICDILocation location, + ICDICondition condition, String threadId ) throws CDIException; /** @@ -71,10 +71,10 @@ public interface ICBreakpointManager extends ICSessionObject * @return a watchpoint * @throws CDIException on failure. Reasons include: */ - ICWatchpoint setWatchpoint( int type, + ICDIWatchpoint setWatchpoint( int type, int watchType, String expression, - ICCondition condition ) throws CDIException; + ICDICondition condition ) throws CDIException; /** * Sets a catchpoint for the given catch event. @@ -84,8 +84,8 @@ public interface ICBreakpointManager extends ICSessionObject * @return a catchpoint * @throws CDIException on failure. Reasons include: */ - ICCatchpoint setCatchpoint( int type, - ICCatchEvent event, + ICDICatchpoint setCatchpoint( int type, + ICDICatchEvent event, String expression, - ICCondition condition ) throws CDIException; + ICDICondition condition ) throws CDIException; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICCatchEvent.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDICatchEvent.java similarity index 87% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICCatchEvent.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDICatchEvent.java index 4f78683a89e..74547592dd9 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICCatchEvent.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDICatchEvent.java @@ -12,7 +12,7 @@ package org.eclipse.cdt.debug.core.cdi; * * @since Jul 9, 2002 */ -public interface ICCatchEvent +public interface ICDICatchEvent { } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICCatchpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDICatchpoint.java similarity index 78% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICCatchpoint.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDICatchpoint.java index 0da12434668..38948b1b572 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICCatchpoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDICatchpoint.java @@ -12,7 +12,7 @@ package org.eclipse.cdt.debug.core.cdi; * * @since Jul 9, 2002 */ -public interface ICCatchpoint extends ICBreakpoint +public interface ICDICatchpoint extends ICDIBreakpoint { /** * Returns the catch event for this catchpoint. @@ -20,5 +20,5 @@ public interface ICCatchpoint extends ICBreakpoint * @return the catch event for this catchpoint * @throws CDIException if this method fails. Reasons include: */ - ICCatchEvent getEvent() throws CDIException; + ICDICatchEvent getEvent() throws CDIException; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICCondition.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDICondition.java similarity index 93% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICCondition.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDICondition.java index 952cd8d277b..9117269ff70 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICCondition.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDICondition.java @@ -12,7 +12,7 @@ package org.eclipse.cdt.debug.core.cdi; * * @since Jul 9, 2002 */ -public interface ICCondition +public interface ICDICondition { /** * Returns the condition expression. diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDebugConfiguration.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIDebugConfiguration.java similarity index 98% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDebugConfiguration.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIDebugConfiguration.java index 722929bf674..ac579b7d068 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDebugConfiguration.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIDebugConfiguration.java @@ -11,7 +11,7 @@ package org.eclipse.cdt.debug.core.cdi; * * @since Aug 6, 2002 */ -public interface ICDebugConfiguration +public interface ICDIDebugConfiguration { /** * Returns whether this session supports termination. diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICEndSteppingRange.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIEndSteppingRange.java similarity index 80% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICEndSteppingRange.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIEndSteppingRange.java index 84f991a146d..8999b1a7353 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICEndSteppingRange.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIEndSteppingRange.java @@ -12,6 +12,6 @@ package org.eclipse.cdt.debug.core.cdi; * * @since Jul 10, 2002 */ -public interface ICEndSteppingRange extends ICSessionObject +public interface ICDIEndSteppingRange extends ICDISessionObject { } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICEventManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIEventManager.java similarity index 74% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICEventManager.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIEventManager.java index 0ac11337032..111090dc058 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICEventManager.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIEventManager.java @@ -6,7 +6,7 @@ package org.eclipse.cdt.debug.core.cdi; -import org.eclipse.cdt.debug.core.cdi.event.ICEventListener; +import org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener; /** * @@ -15,7 +15,7 @@ import org.eclipse.cdt.debug.core.cdi.event.ICEventListener; * * @since Jul 10, 2002 */ -public interface ICEventManager extends ICSessionObject +public interface ICDIEventManager extends ICDISessionObject { /** * Adds the given listener to the collection of registered @@ -24,7 +24,7 @@ public interface ICEventManager extends ICSessionObject * * @param listener - the listener to add */ - void addEventListener( ICEventListener listener ); + void addEventListener( ICDIEventListener listener ); /** * Removes the given listener from the collection of registered @@ -33,5 +33,5 @@ public interface ICEventManager extends ICSessionObject * * @param listener - the listener to remove */ - void removeEventListener( ICEventListener listener ); + void removeEventListener( ICDIEventListener listener ); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICExitInfo.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIExitInfo.java similarity index 74% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICExitInfo.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIExitInfo.java index 3cae20b0c6f..173dfe85438 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICExitInfo.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIExitInfo.java @@ -6,7 +6,7 @@ package org.eclipse.cdt.debug.core.cdi; -import org.eclipse.cdt.debug.core.cdi.model.ICObject; +import org.eclipse.cdt.debug.core.cdi.model.ICDIObject; /** * @@ -15,7 +15,7 @@ import org.eclipse.cdt.debug.core.cdi.model.ICObject; * * @since Jul 10, 2002 */ -public interface ICExitInfo extends ICSessionObject +public interface ICDIExitInfo extends ICDISessionObject { /** * Returns an exit code. diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICExpressionManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIExpressionManager.java similarity index 69% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICExpressionManager.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIExpressionManager.java index 446a351576f..e58a31b5b12 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICExpressionManager.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIExpressionManager.java @@ -5,7 +5,7 @@ package org.eclipse.cdt.debug.core.cdi; -import org.eclipse.cdt.debug.core.cdi.model.ICExpression; +import org.eclipse.cdt.debug.core.cdi.model.ICDIExpression; /** * @@ -14,7 +14,7 @@ import org.eclipse.cdt.debug.core.cdi.model.ICExpression; * * @since Jul 9, 2002 */ -public interface ICExpressionManager extends ICSessionObject +public interface ICDIExpressionManager extends ICDISessionObject { /** * Adds the given expression to the collection of registered @@ -24,7 +24,7 @@ public interface ICExpressionManager extends ICSessionObject * @param expression - the expression to add * @throws CDIException on failure. Reasons include: */ - void addExpression( ICExpression expression ) throws CDIException; + void addExpression( ICDIExpression expression ) throws CDIException; /** * Removes the given array of expressions from the expression @@ -33,7 +33,7 @@ public interface ICExpressionManager extends ICSessionObject * @param expressions - the array of expressions to remove * @throws CDIException on failure. Reasons include: */ - void removeExpressions( ICExpression[] expressions ) throws CDIException; + void removeExpressions( ICDIExpression[] expressions ) throws CDIException; /** * Removes the given expression from the expression manager. @@ -41,16 +41,16 @@ public interface ICExpressionManager extends ICSessionObject * @param expressions - the expression to remove * @throws CDIException on failure. Reasons include: */ - void removeExpression( ICExpression expression ) throws CDIException; + void removeExpression( ICDIExpression expression ) throws CDIException; /** * Returns an expression specified by the given identifier. * * @param expressionId - the expression identifier - * @return ICExpression an expression specified by the given identifier + * @return ICDIExpression an expression specified by the given identifier * @throws CDIException on failure. Reasons include: */ - ICExpression getExpression( String expressionId ) throws CDIException; + ICDIExpression getExpression( String expressionId ) throws CDIException; /** * Returns a collection of all registered expressions, possibly empty. @@ -58,5 +58,5 @@ public interface ICExpressionManager extends ICSessionObject * @return an array of expressions * @throws CDIException on failure. Reasons include: */ - ICExpression[] getExpressions() throws CDIException; + ICDIExpression[] getExpressions() throws CDIException; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICLocation.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDILocation.java similarity index 87% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICLocation.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDILocation.java index 64984ce0b28..ec7317a916c 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICLocation.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDILocation.java @@ -5,7 +5,7 @@ */ package org.eclipse.cdt.debug.core.cdi; -import org.eclipse.cdt.debug.core.cdi.model.ICInstruction; +import org.eclipse.cdt.debug.core.cdi.model.ICDIInstruction; /** * @@ -13,7 +13,7 @@ import org.eclipse.cdt.debug.core.cdi.model.ICInstruction; * * @since Jul 9, 2002 */ -public interface ICLocation +public interface ICDILocation { /** * Returns the address of this location. @@ -53,7 +53,7 @@ public interface ICLocation * @return an array of the machine instructions * @throws CDIException on failure. Reasons include: */ - ICInstruction[] getInstructions() throws CDIException; + ICDIInstruction[] getInstructions() throws CDIException; /** * Returns an array of the machine instructions of the function @@ -65,5 +65,5 @@ public interface ICLocation * @return an array of the machine instructions * @throws CDIException on failure. Reasons include: */ - ICInstruction[] getInstructions( int maxCount ) throws CDIException; + ICDIInstruction[] getInstructions( int maxCount ) throws CDIException; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICLocationBreakpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDILocationBreakpoint.java similarity index 77% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICLocationBreakpoint.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDILocationBreakpoint.java index 9247a167478..1dea3fadd31 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICLocationBreakpoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDILocationBreakpoint.java @@ -12,7 +12,7 @@ package org.eclipse.cdt.debug.core.cdi; * * @since Jul 9, 2002 */ -public interface ICLocationBreakpoint extends ICBreakpoint +public interface ICDILocationBreakpoint extends ICDIBreakpoint { /** * Returns the location of this breakpoint. @@ -20,5 +20,5 @@ public interface ICLocationBreakpoint extends ICBreakpoint * @return the location of this breakpoint * @throws CDIException if this method fails. Reasons include: */ - ICLocation getLocation() throws CDIException; + ICDILocation getLocation() throws CDIException; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICMemoryManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIMemoryManager.java similarity index 74% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICMemoryManager.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIMemoryManager.java index c2825008421..af7b52f4fe4 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICMemoryManager.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIMemoryManager.java @@ -5,8 +5,8 @@ package org.eclipse.cdt.debug.core.cdi; -import org.eclipse.cdt.debug.core.cdi.model.ICMemoryBlock; -import org.eclipse.cdt.debug.core.cdi.model.ICTarget; +import org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlock; +import org.eclipse.cdt.debug.core.cdi.model.ICDITarget; /** * @@ -15,7 +15,7 @@ import org.eclipse.cdt.debug.core.cdi.model.ICTarget; * * @since Jul 9, 2002 */ -public interface ICMemoryManager extends ICSessionObject +public interface ICDIMemoryManager extends ICDISessionObject { /** * Adds the given memory block to the debug session. @@ -23,7 +23,7 @@ public interface ICMemoryManager extends ICSessionObject * @param memoryBlock - the memory block to be added * @exception CDIException on failure. Reasons include: */ - void addBlock( ICMemoryBlock memoryBlock ) throws CDIException; + void addBlock( ICDIMemoryBlock memoryBlock ) throws CDIException; /** * Removes the given memory block from the debug session. @@ -31,7 +31,7 @@ public interface ICMemoryManager extends ICSessionObject * @param memoryBlock - the memory block to be removed * @exception CDIException on failure. Reasons include: */ - void removeBlock( ICMemoryBlock memoryBlock ); + void removeBlock( ICDIMemoryBlock memoryBlock ); /** * Removes the given array of memory blocks from the debug session. @@ -39,7 +39,7 @@ public interface ICMemoryManager extends ICSessionObject * @param memoryBlock - the array of memory blocks to be removed * @exception CDIException on failure. Reasons include: */ - void removeBlocks( ICMemoryBlock[] memoryBlocks ) throws CDIException;; + void removeBlocks( ICDIMemoryBlock[] memoryBlocks ) throws CDIException;; /** * Removes all memory blocks from the debug session. @@ -55,7 +55,7 @@ public interface ICMemoryManager extends ICSessionObject * @return a memory block with the specified identifier * @throws CDIException on failure. Reasons include: */ - ICMemoryBlock getBlock( String id ) throws CDIException; + ICDIMemoryBlock getBlock( String id ) throws CDIException; /** * Returns an array of all memory blocks set for this debug session. @@ -63,5 +63,5 @@ public interface ICMemoryManager extends ICSessionObject * @return an array of all memory blocks set for this debug session * @throws CDIException on failure. Reasons include: */ - ICMemoryBlock[] getBlocks() throws CDIException; + ICDIMemoryBlock[] getBlocks() throws CDIException; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICRuntimeOptions.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIRuntimeOptions.java similarity index 94% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICRuntimeOptions.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIRuntimeOptions.java index e7a964e615d..722075e48cd 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICRuntimeOptions.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIRuntimeOptions.java @@ -13,7 +13,7 @@ import java.util.Properties; * * @since Aug 6, 2002 */ -public interface ICRuntimeOptions { +public interface ICDIRuntimeOptions { /** * Program/Inferior arguments. diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICSession.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISession.java similarity index 81% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICSession.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISession.java index 00e062be435..7686ac04213 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICSession.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISession.java @@ -5,7 +5,7 @@ package org.eclipse.cdt.debug.core.cdi; -import org.eclipse.cdt.debug.core.cdi.model.ICTarget; +import org.eclipse.cdt.debug.core.cdi.model.ICDITarget; /** * @@ -13,7 +13,7 @@ import org.eclipse.cdt.debug.core.cdi.model.ICTarget; * * @since Jun 28, 2002 */ -public interface ICSession +public interface ICDISession { /** * Returns all the debug targets associatd with this sesion, @@ -22,7 +22,7 @@ public interface ICSession * * @return an array of debug targets */ - ICTarget[] getTargets(); + ICDITarget[] getTargets(); /** * Sets the value of a debug session attribute. @@ -45,56 +45,56 @@ public interface ICSession * * @return the breakpoint manager */ - ICBreakpointManager getBreakpointManager(); + ICDIBreakpointManager getBreakpointManager(); /** * Returns the signal manager of this debug session. * * @return the signal manager */ - ICSignalManager getSignalManager(); + ICDISignalManager getSignalManager(); /** * Returns the expression manager of this debug session. * * @return the expression manager */ - ICExpressionManager getExpressionManager(); + ICDIExpressionManager getExpressionManager(); /** * Returns the memory manager of this debug session. * * @return the memory manager */ - ICMemoryManager getMemoryManager(); + ICDIMemoryManager getMemoryManager(); /** * Returns the source manager of this debug session. * * @return the source manager */ - ICSourceManager getSourceManager(); + ICDISourceManager getSourceManager(); /** * Returns the event manager of this debug session. * * @return the event manager */ - ICEventManager getEventManager(); + ICDIEventManager getEventManager(); /** * Returns the configuration description of this debug session. * * @return the configuration description */ - ICDebugConfiguration getConfiguration(); + ICDIDebugConfiguration getConfiguration(); /** * Returns the Runtime options for this debug session. * * @return the configuration description */ - ICRuntimeOptions getRuntimeOptions(); + ICDIRuntimeOptions getRuntimeOptions(); /** * Returns whether this element is terminated. diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICSessionObject.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISessionObject.java similarity index 85% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICSessionObject.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISessionObject.java index c201c936d6b..1d8c16518f0 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICSessionObject.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISessionObject.java @@ -11,12 +11,12 @@ package org.eclipse.cdt.debug.core.cdi; * * @since Jul 9, 2002 */ -public interface ICSessionObject +public interface ICDISessionObject { /** * Returns the debug session this object is associated with. * * @return the debug session this object is associated with */ - ICSession getSession(); + ICDISession getSession(); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICSignal.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISignal.java similarity index 88% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICSignal.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISignal.java index 05729cc0bc9..ebb1e00ed9d 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICSignal.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISignal.java @@ -12,7 +12,7 @@ package org.eclipse.cdt.debug.core.cdi; * * @since Jul 10, 2002 */ -public interface ICSignal extends ICSessionObject +public interface ICDISignal extends ICDISessionObject { /** * Returns the name of this signal. diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICSignalManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISignalManager.java similarity index 79% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICSignalManager.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISignalManager.java index 5843acb6809..6adfcf46570 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICSignalManager.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISignalManager.java @@ -12,7 +12,7 @@ package org.eclipse.cdt.debug.core.cdi; * * @since Jul 9, 2002 */ -public interface ICSignalManager extends ICSessionObject +public interface ICDISignalManager extends ICDISessionObject { /** * Returns the array of signals defined for this session. @@ -20,5 +20,5 @@ public interface ICSignalManager extends ICSessionObject * @return the array of signals * @throws CDIException on failure. Reasons include: */ - ICSignal[] getSignals() throws CDIException; + ICDISignal[] getSignals() throws CDIException; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICSourceManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISourceManager.java similarity index 93% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICSourceManager.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISourceManager.java index 221d33bee43..277c416415e 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICSourceManager.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISourceManager.java @@ -13,7 +13,7 @@ import java.io.File; * * @since Jul 9, 2002 */ -public interface ICSourceManager extends ICSessionObject +public interface ICDISourceManager extends ICDISessionObject { /** * Returns an array of directories. Returns the empty array diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICWatchpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIWatchpoint.java similarity index 93% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICWatchpoint.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIWatchpoint.java index 5ae19a42abc..831387b7698 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICWatchpoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIWatchpoint.java @@ -12,7 +12,7 @@ package org.eclipse.cdt.debug.core.cdi; * * @since Jul 9, 2002 */ -public interface ICWatchpoint extends ICBreakpoint +public interface ICDIWatchpoint extends ICDIBreakpoint { final static public int WRITE = 0x1; final static public int READ = 0x2; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICChangedEvent.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIChangedEvent.java similarity index 83% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICChangedEvent.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIChangedEvent.java index 722bf45aaae..42cbeb33c90 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICChangedEvent.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIChangedEvent.java @@ -12,6 +12,6 @@ package org.eclipse.cdt.debug.core.cdi.event; * * @since Jul 10, 2002 */ -public interface ICChangedEvent extends ICEvent +public interface ICDIChangedEvent extends ICDIEvent { } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICCreatedEvent.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDICreatedEvent.java similarity index 71% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICCreatedEvent.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDICreatedEvent.java index 4d5a8985fa2..9ade3ece881 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICCreatedEvent.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDICreatedEvent.java @@ -11,12 +11,12 @@ package org.eclipse.cdt.debug.core.cdi.event; * Notifies that the originator has been created. * The originators: *
    - *
  • target (ICTarget) - *
  • thread (ICThread) + *
  • target (ICDITarget) + *
  • thread (ICDIThread) *
* * @since Jul 10, 2002 */ -public interface ICCreatedEvent extends ICEvent +public interface ICDICreatedEvent extends ICDIEvent { } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDisconnectedEvent.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIDisconnectedEvent.java similarity index 75% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDisconnectedEvent.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIDisconnectedEvent.java index 7d707d8e185..f2643ace7ea 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDisconnectedEvent.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIDisconnectedEvent.java @@ -11,11 +11,11 @@ package org.eclipse.cdt.debug.core.cdi.event; * Notifies that the originator has disconnected. * The originators: *
    - *
  • target (ICTarget) + *
  • target (ICDITarget) *
* * @since Jul 10, 2002 */ -public interface ICDisconnectedEvent extends ICEvent +public interface ICDIDisconnectedEvent extends ICDIEvent { } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICEvent.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIEvent.java similarity index 76% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICEvent.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIEvent.java index b2018746552..f49e3046e4c 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICEvent.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIEvent.java @@ -6,7 +6,7 @@ package org.eclipse.cdt.debug.core.cdi.event; -import org.eclipse.cdt.debug.core.cdi.model.ICObject; +import org.eclipse.cdt.debug.core.cdi.model.ICDIObject; /** * @@ -14,12 +14,12 @@ import org.eclipse.cdt.debug.core.cdi.model.ICObject; * * @since Jul 18, 2002 */ -public interface ICEvent +public interface ICDIEvent { /** * The CDI object on which the event initially occurred. * * @return the CDI object on which the event initially occurred */ - ICObject getSource(); + ICDIObject getSource(); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICEventListener.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIEventListener.java similarity index 83% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICEventListener.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIEventListener.java index 48a2199fead..b066bc14e68 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICEventListener.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIEventListener.java @@ -13,12 +13,12 @@ package org.eclipse.cdt.debug.core.cdi.event; * * @since Jul 10, 2002 */ -public interface ICEventListener +public interface ICDIEventListener { /** * Notifies this listener of the given event. * * @param event - the event */ - void handleDebugEvent( ICEvent event ); + void handleDebugEvent( ICDIEvent event ); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICExitedEvent.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIExitedEvent.java similarity index 70% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICExitedEvent.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIExitedEvent.java index 71e85fd83bd..36628e46572 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICExitedEvent.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIExitedEvent.java @@ -5,19 +5,19 @@ */ package org.eclipse.cdt.debug.core.cdi.event; -import org.eclipse.cdt.debug.core.cdi.ICExitInfo; +import org.eclipse.cdt.debug.core.cdi.ICDIExitInfo; /** * * Notifies that the program has exited. * The originators: *
    - *
  • target (ICTarget) + *
  • target (ICDITarget) *
* * @since Jul 10, 2002 */ -public interface ICExitedEvent extends ICEvent +public interface ICDIExitedEvent extends ICDIEvent { /** * Returns the information provided by the session when program @@ -25,5 +25,5 @@ public interface ICExitedEvent extends ICEvent * * @return the exit information */ - ICExitInfo getExitInfo(); + ICDIExitInfo getExitInfo(); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICLoadedEvent.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDILoadedEvent.java similarity index 73% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICLoadedEvent.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDILoadedEvent.java index 2ce0e69a134..82a0de15278 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICLoadedEvent.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDILoadedEvent.java @@ -11,11 +11,11 @@ package org.eclipse.cdt.debug.core.cdi.event; * Notifies that the originator has been restarted. * The originators: *
    - *
  • shared library (ICSharedLibrary) + *
  • shared library (ICDISharedLibrary) *
* * @since Jul 11, 2002 */ -public interface ICLoadedEvent extends ICEvent +public interface ICDILoadedEvent extends ICDIEvent { } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICRestartedEvent.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIRestartedEvent.java similarity index 76% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICRestartedEvent.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIRestartedEvent.java index 83958ae293a..8b5e8387675 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICRestartedEvent.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIRestartedEvent.java @@ -11,11 +11,11 @@ package org.eclipse.cdt.debug.core.cdi.event; * Notifies that the originator has been restarted. * The originators: *
    - *
  • target (ICTarget) + *
  • target (ICDITarget) *
* * @since Jul 11, 2002 */ -public interface ICRestartedEvent extends ICEvent +public interface ICDIRestartedEvent extends ICDIEvent { } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICResumedEvent.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIResumedEvent.java similarity index 71% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICResumedEvent.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIResumedEvent.java index 00397926fa5..a7a14b025da 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICResumedEvent.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIResumedEvent.java @@ -10,12 +10,12 @@ package org.eclipse.cdt.debug.core.cdi.event; * Notifies that the originator has been resumed. * The originators: *
    - *
  • target (ICTarget) - *
  • thread (ICThread) + *
  • target (ICDITarget) + *
  • thread (ICDIThread) *
* * @since Jul 10, 2002 */ -public interface ICResumedEvent extends ICEvent +public interface ICDIResumedEvent extends ICDIEvent { } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICSteppingEvent.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDISteppingEvent.java similarity index 81% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICSteppingEvent.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDISteppingEvent.java index f6bd6f3ad2e..fb0d5a0f85d 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICSteppingEvent.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDISteppingEvent.java @@ -7,12 +7,12 @@ package org.eclipse.cdt.debug.core.cdi.event; /** * - * Can be originated by an ICThread object when the thread is + * Can be originated by an ICDIThread object when the thread is * being resumed by a request to step. * * @since Jul 10, 2002 */ -public interface ICSteppingEvent extends ICEvent +public interface ICDISteppingEvent extends ICDIEvent { final static public int STEP_OVER = 0; final static public int STEP_INTO = 1; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICSuspendedEvent.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDISuspendedEvent.java similarity index 55% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICSuspendedEvent.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDISuspendedEvent.java index 64f757bc09d..2097be7d7c4 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICSuspendedEvent.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDISuspendedEvent.java @@ -6,40 +6,40 @@ package org.eclipse.cdt.debug.core.cdi.event; -import org.eclipse.cdt.debug.core.cdi.ICSessionObject; -import org.eclipse.cdt.debug.core.cdi.model.ICStackFrame; +import org.eclipse.cdt.debug.core.cdi.ICDISessionObject; +import org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame; /** * * Notifies that the originator has been suspended. * The originators: *
    - *
  • target (ICTarget) - *
  • thread (ICThread) + *
  • target (ICDITarget) + *
  • thread (ICDIThread) *
* The reason of the suspension can be one of the following session * objects: *
    - *
  • breakpoint (ICBreakpoint) - *
  • signal (ICSignal) - *
  • end of the stepping range (ICEndSteppingRange) + *
  • breakpoint (ICDIBreakpoint) + *
  • signal (ICDISignal) + *
  • end of the stepping range (ICDIEndSteppingRange) *
* * @since Jul 10, 2002 */ -public interface ICSuspendedEvent extends ICEvent +public interface ICDISuspendedEvent extends ICDIEvent { /** * Returns the session object that caused the suspension. * - * @return ICObject + * @return ICDIObject */ - ICSessionObject getReason(); + ICDISessionObject getReason(); /** * Returns the current stack frame. * * @return the current stack frame */ - ICStackFrame getStackFrame(); + ICDIStackFrame getStackFrame(); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICTerminatedEvent.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDITerminatedEvent.java similarity index 70% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICTerminatedEvent.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDITerminatedEvent.java index 8c17c1c6300..767e36ed222 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICTerminatedEvent.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDITerminatedEvent.java @@ -10,12 +10,12 @@ package org.eclipse.cdt.debug.core.cdi.event; * Notifies that the originator has terminated. * The originators: *
    - *
  • target (ICTarget) - *
  • thread (ICThread) + *
  • target (ICDITarget) + *
  • thread (ICDIThread) *
* * @since Jul 10, 2002 */ -public interface ICTerminatedEvent extends ICEvent +public interface ICDITerminatedEvent extends ICDIEvent { } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICArgument.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIArgument.java similarity index 81% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICArgument.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIArgument.java index 0b7a23e9f1c..3e3b25acc67 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICArgument.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIArgument.java @@ -12,6 +12,6 @@ package org.eclipse.cdt.debug.core.cdi.model; * * @since Jul 22, 2002 */ -public interface ICArgument extends ICVariable +public interface ICDIArgument extends ICDIVariable { } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICArrayValue.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIArrayValue.java similarity index 80% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICArrayValue.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIArrayValue.java index d12b0206b35..79cea288ec2 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICArrayValue.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIArrayValue.java @@ -11,6 +11,6 @@ package org.eclipse.cdt.debug.core.cdi.model; * * @since Aug 9, 2002 */ -public interface ICArrayValue extends ICValue +public interface ICDIArrayValue extends ICDIValue { } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICExpression.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIExpression.java similarity index 87% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICExpression.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIExpression.java index 2bc205d6a0f..4906779d81e 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICExpression.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIExpression.java @@ -14,7 +14,7 @@ import org.eclipse.cdt.debug.core.cdi.CDIException; * * @since Jul 9, 2002 */ -public interface ICExpression extends ICObject +public interface ICDIExpression extends ICDIObject { /** * Returns this expression's snippet of code. @@ -30,5 +30,5 @@ public interface ICExpression extends ICObject * @return the current value of this expression * @throws CDIException if this method fails. Reasons include: */ - ICValue getValue() throws CDIException; + ICDIValue getValue() throws CDIException; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICGlobalVariable.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIGlobalVariable.java similarity index 79% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICGlobalVariable.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIGlobalVariable.java index 9b03c911a46..8564aea3b73 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICGlobalVariable.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIGlobalVariable.java @@ -12,6 +12,6 @@ package org.eclipse.cdt.debug.core.cdi.model; * * @since Jul 9, 2002 */ -public interface ICGlobalVariable extends ICVariable +public interface ICDIGlobalVariable extends ICDIVariable { } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICInstruction.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIInstruction.java similarity index 86% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICInstruction.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIInstruction.java index b8eb04cdf14..a671cc48888 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICInstruction.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIInstruction.java @@ -12,7 +12,7 @@ package org.eclipse.cdt.debug.core.cdi.model; * * @since Jul 10, 2002 */ -public interface ICInstruction extends ICObject +public interface ICDIInstruction extends ICDIObject { /** * Returns the instruction's offset. diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICMemoryBlock.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIMemoryBlock.java similarity index 97% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICMemoryBlock.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIMemoryBlock.java index a7f512eb6cf..6d0e2876658 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICMemoryBlock.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIMemoryBlock.java @@ -15,7 +15,7 @@ import org.eclipse.cdt.debug.core.cdi.CDIException; * * @since Jul 18, 2002 */ -public interface ICMemoryBlock extends ICObject +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/ICObject.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIObject.java similarity index 88% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICObject.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIObject.java index 5ce20707e82..aab381815f5 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICObject.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIObject.java @@ -11,7 +11,7 @@ package org.eclipse.cdt.debug.core.cdi.model; * * @since Jul 8, 2002 */ -public interface ICObject +public interface ICDIObject { /** * Returns the identifier of this object. @@ -25,7 +25,7 @@ public interface ICObject * * @return the target this object is contained in */ - ICTarget getCDITarget(); + ICDITarget getCDITarget(); /** * Returns the parent of this object or null if this @@ -33,5 +33,5 @@ public interface ICObject * * @return the parent of this object */ - ICObject getParent(); + ICDIObject getParent(); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICPointerValue.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIPointerValue.java similarity index 80% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICPointerValue.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIPointerValue.java index c49a983f1c2..13c5f3e76ab 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICPointerValue.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIPointerValue.java @@ -11,7 +11,7 @@ package org.eclipse.cdt.debug.core.cdi.model; * * @since Aug 9, 2002 */ -public interface ICPointerValue extends ICValue +public interface ICDIPointerValue extends ICDIValue { } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICRegister.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIRegister.java similarity index 83% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICRegister.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIRegister.java index 18e4a10ff5f..d2751d74a0d 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICRegister.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIRegister.java @@ -15,7 +15,7 @@ import org.eclipse.cdt.debug.core.cdi.CDIException; * * @since Jul 9, 2002 */ -public interface ICRegister extends ICVariable +public interface ICDIRegister extends ICDIVariable { /** * Returns the register group this register is contained in. @@ -23,5 +23,5 @@ public interface ICRegister extends ICVariable * @return the register group this register is contained in * @exception CDIException if this method fails. Reasons include: */ - ICRegisterGroup getRegisterGroup() throws CDIException; + ICDIRegisterGroup getRegisterGroup() throws CDIException; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICRegisterGroup.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIRegisterGroup.java similarity index 81% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICRegisterGroup.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIRegisterGroup.java index 6ebf3ee9fe0..11215adca2b 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICRegisterGroup.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIRegisterGroup.java @@ -14,7 +14,7 @@ import org.eclipse.cdt.debug.core.cdi.CDIException; * * @since Jul 9, 2002 */ -public interface ICRegisterGroup extends ICObject +public interface ICDIRegisterGroup extends ICDIObject { /** * Returns the registers in this register group. @@ -22,5 +22,5 @@ public interface ICRegisterGroup extends ICObject * @return the registers in this register group * @throws CDIException if this method fails. Reasons include: */ - ICRegister[] getRegisters() throws CDIException; + ICDIRegister[] getRegisters() throws CDIException; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICSharedLibrary.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDISharedLibrary.java similarity index 87% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICSharedLibrary.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDISharedLibrary.java index f3eadb3f021..57a217c6942 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICSharedLibrary.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDISharedLibrary.java @@ -14,7 +14,7 @@ import java.io.File; * * @since Jul 8, 2002 */ -public interface ICSharedLibrary extends ICObject +public interface ICDISharedLibrary extends ICDIObject { /** * Returns the shared library file. diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICStackFrame.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIStackFrame.java similarity index 80% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICStackFrame.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIStackFrame.java index 224d7478ccd..f0e45e70fbe 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICStackFrame.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIStackFrame.java @@ -7,7 +7,7 @@ package org.eclipse.cdt.debug.core.cdi.model; import org.eclipse.cdt.debug.core.cdi.CDIException; -import org.eclipse.cdt.debug.core.cdi.ICLocation; +import org.eclipse.cdt.debug.core.cdi.ICDILocation; /** * @@ -17,7 +17,7 @@ import org.eclipse.cdt.debug.core.cdi.ICLocation; * * @since Jul 8, 2002 */ -public interface ICStackFrame extends ICObject +public interface ICDIStackFrame extends ICDIObject { /** * Returns the location of the instruction pointer in this @@ -25,7 +25,7 @@ public interface ICStackFrame extends ICObject * * @return the location of the instruction pointer */ - ICLocation getLocation(); + ICDILocation getLocation(); /** * Returns the visible variables in this stack frame. An empty @@ -34,7 +34,7 @@ public interface ICStackFrame extends ICObject * @return a collection of visible variables * @throws CDIException if this method fails. Reasons include: */ - ICVariable[] getLocalVariables() throws CDIException; + ICDIVariable[] getLocalVariables() throws CDIException; /** * Returns the arguments in this stack frame. An empty collection @@ -43,5 +43,5 @@ public interface ICStackFrame extends ICObject * @return a collection of arguments * @throws CDIException if this method fails. Reasons include: */ - ICArgument[] getArguments() throws CDIException; + ICDIArgument[] getArguments() throws CDIException; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICStaticVariable.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIStaticVariable.java similarity index 79% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICStaticVariable.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIStaticVariable.java index 98fc3bc5ec8..08300ffb9cf 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICStaticVariable.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIStaticVariable.java @@ -12,6 +12,6 @@ package org.eclipse.cdt.debug.core.cdi.model; * * @since Jul 9, 2002 */ -public interface ICStaticVariable extends ICVariable +public interface ICDIStaticVariable extends ICDIVariable { } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICStringValue.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIStringValue.java similarity index 80% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICStringValue.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIStringValue.java index c9201a06427..683eb77118d 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICStringValue.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIStringValue.java @@ -11,6 +11,6 @@ package org.eclipse.cdt.debug.core.cdi.model; * * @since Aug 9, 2002 */ -public interface ICStringValue extends ICValue +public interface ICDIStringValue extends ICDIValue { } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICStructureValue.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIStructureValue.java similarity index 80% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICStructureValue.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIStructureValue.java index 4af8de1b910..acf7d246493 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICStructureValue.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIStructureValue.java @@ -11,7 +11,7 @@ package org.eclipse.cdt.debug.core.cdi.model; * * @since Aug 9, 2002 */ -public interface ICStructureValue extends ICValue +public interface ICDIStructureValue extends ICDIValue { } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICTarget.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java similarity index 90% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICTarget.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java index d35c1c9c1eb..a96eb1f8312 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICTarget.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java @@ -10,7 +10,7 @@ import java.io.InputStream; import java.io.OutputStream; import org.eclipse.cdt.debug.core.cdi.CDIException; -import org.eclipse.cdt.debug.core.cdi.ICSession; +import org.eclipse.cdt.debug.core.cdi.ICDISession; /** * @@ -19,14 +19,14 @@ import org.eclipse.cdt.debug.core.cdi.ICSession; * * @since Jul 8, 2002 */ -public interface ICTarget extends ICObject +public interface ICDITarget extends ICDIObject { /** * Returns the debug session this target is contained in. * * @return the debug session this target is contained in */ - ICSession getSession(); + ICDISession getSession(); /** * Gets the output stream of the target process. @@ -60,7 +60,7 @@ public interface ICTarget extends ICObject * @return a collection of shared libraries * @throws CDIException if this method fails. Reasons include: */ - ICSharedLibrary[] getSharedLibraries() throws CDIException; + ICDISharedLibrary[] getSharedLibraries() throws CDIException; /** * Returns the threads contained in this target. @@ -70,7 +70,7 @@ public interface ICTarget extends ICObject * @return a collection of threads * @throws CDIException if this method fails. Reasons include: */ - ICThread[] getThreads() throws CDIException; + ICDIThread[] getThreads() throws CDIException; /** * Returns the thread associated with the given id. @@ -79,7 +79,7 @@ public interface ICTarget extends ICObject * @return the thread associated with the given id * @throws CDIException if this method fails. Reasons include: */ - ICThread getThread( String id ) throws CDIException; + ICDIThread getThread( String id ) throws CDIException; /** * Returns a memory block that starts at the specified memory @@ -91,7 +91,7 @@ public interface ICTarget extends ICObject * with the specified length * @throws CDIException if this method fails. Reasons include: */ - ICMemoryBlock getCMemoryBlock( long startAddress, long length ) throws CDIException; + ICDIMemoryBlock getCMemoryBlock( long startAddress, long length ) throws CDIException; /** * Returns the register groups associated with this target. @@ -99,7 +99,7 @@ public interface ICTarget extends ICObject * @return a collection of register groups * @throws CDIException if this method fails. Reasons include: */ - ICRegisterGroup[] getRegisterGroups() throws CDIException; + ICDIRegisterGroup[] getRegisterGroups() throws CDIException; /** * Returns a collection of global variables associated with @@ -108,17 +108,17 @@ public interface ICTarget extends ICObject * @return a collection of global variables * @throws CDIException if this method fails. Reasons include: */ - ICGlobalVariable[] getGlobalVariables() throws CDIException; + ICDIGlobalVariable[] getGlobalVariables() throws CDIException; /** * Evaluates the expression specified by the given string. - * Returns the evaluation result as an ICValue. + * Returns the evaluation result as an ICDIValue. * * @param - expression string to be evaluated * @return the result of the evaluation * @throws CDIException if this method fails. Reasons include: */ - ICValue evaluateExpressionToValue( String expressionText ) throws CDIException; + ICDIValue evaluateExpressionToValue( String expressionText ) throws CDIException; /** * Evaluates the expression specified by the given string. diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICThread.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIThread.java similarity index 96% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICThread.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIThread.java index c1e61e7fb50..c8ee0f9199c 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICThread.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIThread.java @@ -16,7 +16,7 @@ import org.eclipse.cdt.debug.core.cdi.CDIException; * * @since Jul 8, 2002 */ -public interface ICThread extends ICObject +public interface ICDIThread extends ICDIObject { /** * Returns the stack frames contained in this thread. An @@ -27,7 +27,7 @@ public interface ICThread extends ICObject * @return a collection of stack frames * @throws CDIException if this method fails. Reasons include: */ - ICStackFrame[] getStackFrames() throws CDIException; + ICDIStackFrame[] getStackFrames() throws CDIException; /** * Returns whether this thread is currently suspended. diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICValue.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIValue.java similarity index 91% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICValue.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIValue.java index 16950af3cf1..99addc27e30 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICValue.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIValue.java @@ -15,7 +15,7 @@ import org.eclipse.cdt.debug.core.cdi.CDIException; * * @since Jul 9, 2002 */ -public interface ICValue extends ICObject +public interface ICDIValue extends ICDIObject { /** * Returns a description of the type of data this value contains. @@ -40,5 +40,5 @@ public interface ICValue extends ICObject * @return an array of variables * @throws CDIException if this method fails. Reasons include: */ - ICVariable[] getVariables() throws CDIException; + ICDIVariable[] getVariables() throws CDIException; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICVariable.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIVariable.java similarity index 91% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICVariable.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIVariable.java index 75e0f1b61bb..c1195a448e9 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICVariable.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIVariable.java @@ -15,7 +15,7 @@ import org.eclipse.cdt.debug.core.cdi.CDIException; * * @since Jul 9, 2002 */ -public interface ICVariable extends ICObject +public interface ICDIVariable extends ICDIObject { /** * Returns the name of this variable. @@ -39,7 +39,7 @@ public interface ICVariable extends ICObject * @return the value of this variable * @throws CDIException if this method fails. Reasons include: */ - ICValue getValue() throws CDIException; + ICDIValue getValue() throws CDIException; /** * Returns whether this variable's value has changed since the last suspend event. @@ -64,5 +64,5 @@ public interface ICVariable extends ICObject * @param value - a new value * @throws CDIException if this method fails. Reasons include: */ - void setValue( ICValue value ) throws CDIException; + void setValue( ICDIValue value ) throws CDIException; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDebugElement.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDebugElement.java index 81df8c7637f..736db53dcc9 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDebugElement.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDebugElement.java @@ -9,8 +9,8 @@ package org.eclipse.cdt.debug.internal.core; import org.eclipse.cdt.debug.core.CDebugCorePlugin; import org.eclipse.cdt.debug.core.CDebugModel; import org.eclipse.cdt.debug.core.cdi.CDIException; -import org.eclipse.cdt.debug.core.cdi.ICSession; -import org.eclipse.cdt.debug.core.cdi.model.ICTarget; +import org.eclipse.cdt.debug.core.cdi.ICDISession; +import org.eclipse.cdt.debug.core.cdi.model.ICDITarget; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.PlatformObject; import org.eclipse.core.runtime.Status; @@ -155,7 +155,7 @@ public class CDebugElement extends PlatformObject * * @return the CDI session */ - public ICSession getCDISession() + public ICDISession getCDISession() { return getCDITarget().getSession(); } @@ -165,9 +165,9 @@ public class CDebugElement extends PlatformObject * * @return the underlying CDI target */ - public ICTarget getCDITarget() + public ICDITarget getCDITarget() { - return (ICTarget)getDebugTarget().getAdapter( ICTarget.class ); + return (ICDITarget)getDebugTarget().getAdapter( ICDITarget.class ); } /** diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDebugTarget.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDebugTarget.java index 4f8145d8e5a..01cba828218 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDebugTarget.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDebugTarget.java @@ -16,26 +16,26 @@ import org.eclipse.cdt.debug.core.IFormattedMemoryRetrieval; import org.eclipse.cdt.debug.core.IRestart; import org.eclipse.cdt.debug.core.IState; import org.eclipse.cdt.debug.core.cdi.CDIException; -import org.eclipse.cdt.debug.core.cdi.ICBreakpoint; -import org.eclipse.cdt.debug.core.cdi.ICDebugConfiguration; -import org.eclipse.cdt.debug.core.cdi.ICEndSteppingRange; -import org.eclipse.cdt.debug.core.cdi.ICSessionObject; -import org.eclipse.cdt.debug.core.cdi.ICSignal; -import org.eclipse.cdt.debug.core.cdi.event.ICChangedEvent; -import org.eclipse.cdt.debug.core.cdi.event.ICCreatedEvent; -import org.eclipse.cdt.debug.core.cdi.event.ICDisconnectedEvent; -import org.eclipse.cdt.debug.core.cdi.event.ICEvent; -import org.eclipse.cdt.debug.core.cdi.event.ICEventListener; -import org.eclipse.cdt.debug.core.cdi.event.ICExitedEvent; -import org.eclipse.cdt.debug.core.cdi.event.ICLoadedEvent; -import org.eclipse.cdt.debug.core.cdi.event.ICRestartedEvent; -import org.eclipse.cdt.debug.core.cdi.event.ICResumedEvent; -import org.eclipse.cdt.debug.core.cdi.event.ICSteppingEvent; -import org.eclipse.cdt.debug.core.cdi.event.ICSuspendedEvent; -import org.eclipse.cdt.debug.core.cdi.event.ICTerminatedEvent; -import org.eclipse.cdt.debug.core.cdi.model.ICObject; -import org.eclipse.cdt.debug.core.cdi.model.ICTarget; -import org.eclipse.cdt.debug.core.cdi.model.ICThread; +import org.eclipse.cdt.debug.core.cdi.ICDIBreakpoint; +import org.eclipse.cdt.debug.core.cdi.ICDIDebugConfiguration; +import org.eclipse.cdt.debug.core.cdi.ICDIEndSteppingRange; +import org.eclipse.cdt.debug.core.cdi.ICDISessionObject; +import org.eclipse.cdt.debug.core.cdi.ICDISignal; +import org.eclipse.cdt.debug.core.cdi.event.ICDIChangedEvent; +import org.eclipse.cdt.debug.core.cdi.event.ICDICreatedEvent; +import org.eclipse.cdt.debug.core.cdi.event.ICDIDisconnectedEvent; +import org.eclipse.cdt.debug.core.cdi.event.ICDIEvent; +import org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener; +import org.eclipse.cdt.debug.core.cdi.event.ICDIExitedEvent; +import org.eclipse.cdt.debug.core.cdi.event.ICDILoadedEvent; +import org.eclipse.cdt.debug.core.cdi.event.ICDIRestartedEvent; +import org.eclipse.cdt.debug.core.cdi.event.ICDIResumedEvent; +import org.eclipse.cdt.debug.core.cdi.event.ICDISteppingEvent; +import org.eclipse.cdt.debug.core.cdi.event.ICDISuspendedEvent; +import org.eclipse.cdt.debug.core.cdi.event.ICDITerminatedEvent; +import org.eclipse.cdt.debug.core.cdi.model.ICDIObject; +import org.eclipse.cdt.debug.core.cdi.model.ICDITarget; +import org.eclipse.cdt.debug.core.cdi.model.ICDIThread; import org.eclipse.core.resources.IMarkerDelta; import org.eclipse.debug.core.DebugEvent; import org.eclipse.debug.core.DebugException; @@ -57,7 +57,7 @@ import org.eclipse.debug.core.model.IThread; */ public class CDebugTarget extends CDebugElement implements IDebugTarget, - ICEventListener, + ICDIEventListener, IRestart, IFormattedMemoryRetrieval, IState, @@ -78,7 +78,7 @@ public class CDebugTarget extends CDebugElement /** * The underlying CDI target. */ - private ICTarget fCDITarget; + private ICDITarget fCDITarget; /** * The name of this target. @@ -118,7 +118,7 @@ public class CDebugTarget extends CDebugElement /** * The debug configuration of this session */ - private ICDebugConfiguration fConfig; + private ICDIDebugConfiguration fConfig; /** * Whether terminate is supported. @@ -150,7 +150,7 @@ public class CDebugTarget extends CDebugElement * @param target */ public CDebugTarget( ILaunch launch, - ICTarget cdiTarget, + ICDITarget cdiTarget, String name, IProcess process, boolean allowsTerminate, @@ -189,7 +189,7 @@ public class CDebugTarget extends CDebugElement */ protected void initializeState() { - ICThread[] threads = new ICThread[0]; + ICDIThread[] threads = new ICDIThread[0]; try { threads = getCDITarget().getThreads(); @@ -603,7 +603,7 @@ public class CDebugTarget extends CDebugElement fThreads = threads; } - private void setCDITarget( ICTarget cdiTarget ) + private void setCDITarget( ICDITarget cdiTarget ) { fCDITarget = cdiTarget; } @@ -615,7 +615,7 @@ public class CDebugTarget extends CDebugElement { if ( adapter.equals( IDebugTarget.class ) ) return this; - if ( adapter.equals( ICTarget.class ) ) + if ( adapter.equals( ICDITarget.class ) ) return fCDITarget; if ( adapter.equals( IState.class ) ) return this; @@ -623,85 +623,85 @@ public class CDebugTarget extends CDebugElement } /* (non-Javadoc) - * @see org.eclipse.cdt.debug.core.cdi.event.ICEventListener#handleDebugEvent(ICEvent) + * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener#handleDebugEvent(ICDIEvent) */ - public void handleDebugEvent( ICEvent event ) + public void handleDebugEvent( ICDIEvent event ) { - ICObject source = event.getSource(); + ICDIObject source = event.getSource(); if ( source.getCDITarget().equals( this ) ) { - if ( event instanceof ICCreatedEvent ) + if ( event instanceof ICDICreatedEvent ) { - if ( source instanceof ICThread ) + if ( source instanceof ICDIThread ) { - handleThreadCreatedEvent( (ICCreatedEvent)event ); + handleThreadCreatedEvent( (ICDICreatedEvent)event ); } } - else if ( event instanceof ICSuspendedEvent ) + else if ( event instanceof ICDISuspendedEvent ) { - if ( source instanceof ICTarget ) + if ( source instanceof ICDITarget ) { - handleSuspendedEvent( (ICSuspendedEvent)event ); + handleSuspendedEvent( (ICDISuspendedEvent)event ); } } - else if ( event instanceof ICResumedEvent ) + else if ( event instanceof ICDIResumedEvent ) { - if ( source instanceof ICTarget ) + if ( source instanceof ICDITarget ) { - handleResumedEvent( (ICResumedEvent)event ); + handleResumedEvent( (ICDIResumedEvent)event ); } } - else if ( event instanceof ICExitedEvent ) + else if ( event instanceof ICDIExitedEvent ) { - if ( source instanceof ICTarget ) + if ( source instanceof ICDITarget ) { - handleExitedEvent( (ICExitedEvent)event ); + handleExitedEvent( (ICDIExitedEvent)event ); } } - else if ( event instanceof ICTerminatedEvent ) + else if ( event instanceof ICDITerminatedEvent ) { - if ( source instanceof ICTarget ) + if ( source instanceof ICDITarget ) { - handleTerminatedEvent( (ICTerminatedEvent)event ); + handleTerminatedEvent( (ICDITerminatedEvent)event ); } - else if ( source instanceof ICThread ) + else if ( source instanceof ICDIThread ) { - handleThreadTerminatedEvent( (ICTerminatedEvent)event ); + handleThreadTerminatedEvent( (ICDITerminatedEvent)event ); } } - else if ( event instanceof ICDisconnectedEvent ) + else if ( event instanceof ICDIDisconnectedEvent ) { - if ( source instanceof ICTarget ) + if ( source instanceof ICDITarget ) { - handleDisconnectedEvent( (ICDisconnectedEvent)event ); + handleDisconnectedEvent( (ICDIDisconnectedEvent)event ); } } - else if ( event instanceof ICChangedEvent ) + else if ( event instanceof ICDIChangedEvent ) { - if ( source instanceof ICTarget ) + if ( source instanceof ICDITarget ) { - handleChangedEvent( (ICChangedEvent)event ); + handleChangedEvent( (ICDIChangedEvent)event ); } } - else if ( event instanceof ICLoadedEvent ) + else if ( event instanceof ICDILoadedEvent ) { - if ( source instanceof ICTarget ) + if ( source instanceof ICDITarget ) { - handleLoadedEvent( (ICLoadedEvent)event ); + handleLoadedEvent( (ICDILoadedEvent)event ); } } - else if ( event instanceof ICRestartedEvent ) + else if ( event instanceof ICDIRestartedEvent ) { - if ( source instanceof ICTarget ) + if ( source instanceof ICDITarget ) { - handleRestartedEvent( (ICRestartedEvent)event ); + handleRestartedEvent( (ICDIRestartedEvent)event ); } } - else if ( event instanceof ICSteppingEvent ) + else if ( event instanceof ICDISteppingEvent ) { - if ( source instanceof ICTarget ) + if ( source instanceof ICDITarget ) { - handleSteppingEvent( (ICSteppingEvent)event ); + handleSteppingEvent( (ICDISteppingEvent)event ); } } } @@ -895,7 +895,7 @@ public class CDebugTarget extends CDebugElement * @param thread the underlying CDI thread * @return model thread */ - protected CThread createThread( ICThread cdiThread ) + protected CThread createThread( ICDIThread cdiThread ) { CThread thread = null; thread = new CThread( this, cdiThread ); @@ -912,9 +912,9 @@ public class CDebugTarget extends CDebugElement * Creates a new thread from the given CDI thread and initializes * its state to "Running". * - * @see CDebugTarget#createThread(ICThread) + * @see CDebugTarget#createThread(ICDIThread) */ - protected CThread createRunningThread( ICThread cdiThread ) + protected CThread createRunningThread( ICDIThread cdiThread ) { CThread thread = null; thread = new CThread( this, cdiThread ); @@ -948,27 +948,27 @@ public class CDebugTarget extends CDebugElement return fResumeOnStartup; } - private void handleSuspendedEvent( ICSuspendedEvent event ) + private void handleSuspendedEvent( ICDISuspendedEvent event ) { setSuspended( true ); setCurrentStateId( IState.SUSPENDED ); - ICSessionObject reason = event.getReason(); + ICDISessionObject reason = event.getReason(); setCurrentStateInfo( reason ); - if ( reason instanceof ICEndSteppingRange ) + if ( reason instanceof ICDIEndSteppingRange ) { - handleEndSteppingRange( (ICEndSteppingRange)reason ); + handleEndSteppingRange( (ICDIEndSteppingRange)reason ); } - else if ( reason instanceof ICBreakpoint ) + else if ( reason instanceof ICDIBreakpoint ) { - handleBreakpointHit( (ICBreakpoint)reason ); + handleBreakpointHit( (ICDIBreakpoint)reason ); } - else if ( reason instanceof ICSignal ) + else if ( reason instanceof ICDISignal ) { - handleSuspendedBySignal( (ICSignal)reason ); + handleSuspendedBySignal( (ICDISignal)reason ); } } - private void handleResumedEvent( ICResumedEvent event ) + private void handleResumedEvent( ICDIResumedEvent event ) { setSuspended( false ); setCurrentStateId( IState.RUNNING ); @@ -976,63 +976,63 @@ public class CDebugTarget extends CDebugElement fireResumeEvent( DebugEvent.UNSPECIFIED ); } - private void handleEndSteppingRange( ICEndSteppingRange endSteppingRange ) + private void handleEndSteppingRange( ICDIEndSteppingRange endSteppingRange ) { fireSuspendEvent( DebugEvent.UNSPECIFIED ); } - private void handleBreakpointHit( ICBreakpoint breakpoint ) + private void handleBreakpointHit( ICDIBreakpoint breakpoint ) { fireSuspendEvent( DebugEvent.BREAKPOINT ); } - private void handleSuspendedBySignal( ICSignal signal ) + private void handleSuspendedBySignal( ICDISignal signal ) { fireSuspendEvent( DebugEvent.UNSPECIFIED ); } - private void handleExitedEvent( ICExitedEvent event ) + private void handleExitedEvent( ICDIExitedEvent event ) { setCurrentStateId( IState.EXITED ); setCurrentStateInfo( event.getExitInfo() ); fireChangeEvent( DebugEvent.STATE ); } - private void handleTerminatedEvent( ICTerminatedEvent event ) + private void handleTerminatedEvent( ICDITerminatedEvent event ) { setCurrentStateId( IState.TERMINATED ); setCurrentStateInfo( null ); terminated(); } - private void handleDisconnectedEvent( ICDisconnectedEvent event ) + private void handleDisconnectedEvent( ICDIDisconnectedEvent event ) { setCurrentStateId( IState.DISCONNECTED ); setCurrentStateInfo( null ); disconnected(); } - private void handleChangedEvent( ICChangedEvent event ) + private void handleChangedEvent( ICDIChangedEvent event ) { } - private void handleLoadedEvent( ICLoadedEvent event ) + private void handleLoadedEvent( ICDILoadedEvent event ) { } - private void handleRestartedEvent( ICRestartedEvent event ) + private void handleRestartedEvent( ICDIRestartedEvent event ) { } - private void handleSteppingEvent( ICSteppingEvent event ) + private void handleSteppingEvent( ICDISteppingEvent event ) { setCurrentStateId( IState.STEPPING ); setCurrentStateInfo( null ); } - private void handleThreadCreatedEvent( ICCreatedEvent event ) + private void handleThreadCreatedEvent( ICDICreatedEvent event ) { - ICThread cdiThread = (ICThread)event.getSource(); + ICDIThread cdiThread = (ICDIThread)event.getSource(); CThread thread= findThread( cdiThread ); if ( thread == null ) { @@ -1045,9 +1045,9 @@ public class CDebugTarget extends CDebugElement } } - private void handleThreadTerminatedEvent( ICTerminatedEvent event ) + private void handleThreadTerminatedEvent( ICDITerminatedEvent event ) { - ICThread cdiThread = (ICThread)event.getSource(); + ICDIThread cdiThread = (ICDIThread)event.getSource(); CThread thread = findThread( cdiThread ); if ( thread != null) { @@ -1063,7 +1063,7 @@ public class CDebugTarget extends CDebugElement * @param the underlying CDI thread * @return the associated model thread */ - public CThread findThread( ICThread cdiThread ) + public CThread findThread( ICDIThread cdiThread ) { List threads = getThreadList(); for ( int i = 0; i < threads.size(); i++ ) diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CLocalVariable.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CLocalVariable.java index ab1ca66602c..9681831b0aa 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CLocalVariable.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CLocalVariable.java @@ -8,12 +8,12 @@ package org.eclipse.cdt.debug.internal.core; import java.text.MessageFormat; import org.eclipse.cdt.debug.core.cdi.CDIException; -import org.eclipse.cdt.debug.core.cdi.event.ICChangedEvent; -import org.eclipse.cdt.debug.core.cdi.event.ICEvent; -import org.eclipse.cdt.debug.core.cdi.event.ICEventListener; -import org.eclipse.cdt.debug.core.cdi.model.ICObject; -import org.eclipse.cdt.debug.core.cdi.model.ICValue; -import org.eclipse.cdt.debug.core.cdi.model.ICVariable; +import org.eclipse.cdt.debug.core.cdi.event.ICDIChangedEvent; +import org.eclipse.cdt.debug.core.cdi.event.ICDIEvent; +import org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener; +import org.eclipse.cdt.debug.core.cdi.model.ICDIObject; +import org.eclipse.cdt.debug.core.cdi.model.ICDIValue; +import org.eclipse.cdt.debug.core.cdi.model.ICDIVariable; import org.eclipse.debug.core.DebugEvent; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.model.IValue; @@ -25,12 +25,12 @@ import org.eclipse.debug.core.model.IValue; * @since Aug 9, 2002 */ public class CLocalVariable extends CModificationVariable - implements ICEventListener + implements ICDIEventListener { /** * The underlying CDI variable. */ - private ICVariable fCDIVariable; + private ICDIVariable fCDIVariable; /** * The stack frame this variable is contained in. @@ -41,7 +41,7 @@ public class CLocalVariable extends CModificationVariable * Constructor for CLocalVariable. * @param target */ - public CLocalVariable( CStackFrame stackFrame, ICVariable cdiVariable ) + public CLocalVariable( CStackFrame stackFrame, ICDIVariable cdiVariable ) { super( (CDebugTarget)stackFrame.getDebugTarget() ); fStackFrame = stackFrame; @@ -49,9 +49,9 @@ public class CLocalVariable extends CModificationVariable } /* (non-Javadoc) - * @see org.eclipse.cdt.debug.internal.core.CModificationVariable#setValue(ICValue) + * @see org.eclipse.cdt.debug.internal.core.CModificationVariable#setValue(ICDIValue) */ - protected void setValue( ICValue value ) throws DebugException + protected void setValue( ICDIValue value ) throws DebugException { try { @@ -66,7 +66,7 @@ public class CLocalVariable extends CModificationVariable /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.core.CVariable#retrieveValue() */ - protected ICValue retrieveValue() throws DebugException, CDIException + protected ICDIValue retrieveValue() throws DebugException, CDIException { return ( getStackFrame().isSuspended() ) ? getCDIVariable().getValue() : getLastKnownValue(); @@ -111,7 +111,7 @@ public class CLocalVariable extends CModificationVariable * * @return the underlying CDI variable */ - protected ICVariable getCDIVariable() + protected ICDIVariable getCDIVariable() { return fCDIVariable; } @@ -127,24 +127,24 @@ public class CLocalVariable extends CModificationVariable } /* (non-Javadoc) - * @see org.eclipse.cdt.debug.core.cdi.event.ICEventListener#handleDebugEvent(ICEvent) + * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener#handleDebugEvent(ICDIEvent) */ - public void handleDebugEvent( ICEvent event ) + public void handleDebugEvent( ICDIEvent event ) { - ICObject source = event.getSource(); + ICDIObject source = event.getSource(); if ( source.getCDITarget().equals( getCDITarget() ) ) { - if ( event instanceof ICChangedEvent ) + if ( event instanceof ICDIChangedEvent ) { - if ( source instanceof ICVariable && source.equals( getCDIVariable() ) ) + if ( source instanceof ICDIVariable && source.equals( getCDIVariable() ) ) { - handleChangedEvent( (ICChangedEvent)event ); + handleChangedEvent( (ICDIChangedEvent)event ); } } } } - private void handleChangedEvent( ICChangedEvent event ) + private void handleChangedEvent( ICDIChangedEvent event ) { try { diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CModificationVariable.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CModificationVariable.java index 09630605ed2..490934a916c 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CModificationVariable.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CModificationVariable.java @@ -9,11 +9,11 @@ package org.eclipse.cdt.debug.internal.core; import java.text.MessageFormat; import org.eclipse.cdt.debug.core.cdi.CDIException; -import org.eclipse.cdt.debug.core.cdi.model.ICArrayValue; -import org.eclipse.cdt.debug.core.cdi.model.ICExpression; -import org.eclipse.cdt.debug.core.cdi.model.ICStringValue; -import org.eclipse.cdt.debug.core.cdi.model.ICStructureValue; -import org.eclipse.cdt.debug.core.cdi.model.ICValue; +import org.eclipse.cdt.debug.core.cdi.model.ICDIArrayValue; +import org.eclipse.cdt.debug.core.cdi.model.ICDIExpression; +import org.eclipse.cdt.debug.core.cdi.model.ICDIStringValue; +import org.eclipse.cdt.debug.core.cdi.model.ICDIStructureValue; +import org.eclipse.cdt.debug.core.cdi.model.ICDIValue; import org.eclipse.debug.core.DebugEvent; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.model.IValue; @@ -44,12 +44,12 @@ public abstract class CModificationVariable extends CVariable { try { - ICValue currentValue = getCurrentValue(); + ICDIValue currentValue = getCurrentValue(); if ( currentValue != null ) { - return !( currentValue instanceof ICArrayValue || - currentValue instanceof ICStructureValue || - currentValue instanceof ICStringValue ); + return !( currentValue instanceof ICDIArrayValue || + currentValue instanceof ICDIStructureValue || + currentValue instanceof ICDIStringValue ); } } catch( DebugException e ) @@ -66,7 +66,7 @@ public abstract class CModificationVariable extends CVariable { try { - ICValue vmValue = generateValue( expression ); + ICDIValue vmValue = generateValue( expression ); return vmValue != null; } catch( DebugException e ) @@ -76,9 +76,9 @@ public abstract class CModificationVariable extends CVariable } } - protected ICValue generateValue( String expression ) throws DebugException + protected ICDIValue generateValue( String expression ) throws DebugException { - ICValue value = null; + ICDIValue value = null; try { value = getCDITarget().evaluateExpressionToValue( expression ); @@ -103,7 +103,7 @@ public abstract class CModificationVariable extends CVariable */ public final void setValue( String expression ) throws DebugException { - ICValue value = generateValue( expression ); + ICDIValue value = generateValue( expression ); if ( value == null ) { @@ -117,5 +117,5 @@ public abstract class CModificationVariable extends CVariable /** * Set this variable's value to the given value */ - protected abstract void setValue( ICValue value ) throws DebugException; + protected abstract void setValue( ICDIValue value ) throws DebugException; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CStackFrame.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CStackFrame.java index 8e91a8a7435..15e7a91de0e 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CStackFrame.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CStackFrame.java @@ -13,13 +13,13 @@ import java.util.Iterator; import java.util.List; import org.eclipse.cdt.debug.core.cdi.CDIException; -import org.eclipse.cdt.debug.core.cdi.ICLocation; -import org.eclipse.cdt.debug.core.cdi.event.ICEvent; -import org.eclipse.cdt.debug.core.cdi.event.ICEventListener; -import org.eclipse.cdt.debug.core.cdi.model.ICArgument; -import org.eclipse.cdt.debug.core.cdi.model.ICObject; -import org.eclipse.cdt.debug.core.cdi.model.ICStackFrame; -import org.eclipse.cdt.debug.core.cdi.model.ICVariable; +import org.eclipse.cdt.debug.core.cdi.ICDILocation; +import org.eclipse.cdt.debug.core.cdi.event.ICDIEvent; +import org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener; +import org.eclipse.cdt.debug.core.cdi.model.ICDIArgument; +import org.eclipse.cdt.debug.core.cdi.model.ICDIObject; +import org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame; +import org.eclipse.cdt.debug.core.cdi.model.ICDIVariable; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.model.IRegisterGroup; import org.eclipse.debug.core.model.IStackFrame; @@ -34,17 +34,17 @@ import org.eclipse.debug.core.model.IVariable; */ public class CStackFrame extends CDebugElement implements IStackFrame, - ICEventListener + ICDIEventListener { /** * Underlying CDI stack frame. */ - private ICStackFrame fCDIStackFrame; + private ICDIStackFrame fCDIStackFrame; /** * The last (previous) CDI stack frame. */ - private ICStackFrame fLastCDIStackFrame; + private ICDIStackFrame fLastCDIStackFrame; /** * Containing thread. @@ -65,7 +65,7 @@ public class CStackFrame extends CDebugElement * Constructor for CStackFrame. * @param target */ - public CStackFrame( CThread thread, ICStackFrame cdiFrame ) + public CStackFrame( CThread thread, ICDIStackFrame cdiFrame ) { super( (CDebugTarget)thread.getDebugTarget() ); fCDIStackFrame = cdiFrame; @@ -99,7 +99,7 @@ public class CStackFrame extends CDebugElement Iterator it = vars.iterator(); while( it.hasNext() ) { - fVariables.add( new CLocalVariable( this, (ICVariable)it.next() ) ); + fVariables.add( new CLocalVariable( this, (ICDIVariable)it.next() ) ); } } else if ( fRefreshVariables ) @@ -141,7 +141,7 @@ public class CStackFrame extends CDebugElement Iterator newOnes = locals.iterator(); while( newOnes.hasNext() ) { - fVariables.add( new CLocalVariable( this, (ICVariable)newOnes.next() ) ); + fVariables.add( new CLocalVariable( this, (ICDIVariable)newOnes.next() ) ); } } @@ -170,7 +170,7 @@ public class CStackFrame extends CDebugElement { if ( isSuspended() ) { - ICLocation location = getCDIStackFrame().getLocation(); + ICDILocation location = getCDIStackFrame().getLocation(); if ( location != null ) { return location.getLineNumber(); @@ -220,9 +220,9 @@ public class CStackFrame extends CDebugElement } /* (non-Javadoc) - * @see org.eclipse.cdt.debug.core.cdi.event.ICEventListener#handleDebugEvent(ICEvent) + * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener#handleDebugEvent(ICDIEvent) */ - public void handleDebugEvent( ICEvent event ) + public void handleDebugEvent( ICDIEvent event ) { } @@ -433,7 +433,7 @@ public class CStackFrame extends CDebugElement * * @return the underlying CDI stack frame */ - protected ICStackFrame getCDIStackFrame() + protected ICDIStackFrame getCDIStackFrame() { return fCDIStackFrame; } @@ -444,7 +444,7 @@ public class CStackFrame extends CDebugElement * * @param frame the underlying stack frame */ - protected void setCDIStackFrame( ICStackFrame frame ) + protected void setCDIStackFrame( ICDIStackFrame frame ) { if ( frame != null ) { @@ -463,7 +463,7 @@ public class CStackFrame extends CDebugElement * stack frame. Used only so that equality can be checked on stack frame * after the new one has been set. */ - protected ICStackFrame getLastCDIStackFrame() + protected ICDIStackFrame getLastCDIStackFrame() { return fLastCDIStackFrame; } @@ -473,7 +473,7 @@ public class CStackFrame extends CDebugElement * an underlying stack frame needs to be disposed, stack frames are equal if * the frames are equal and the locations are equal. */ - protected static boolean equalFrame( ICStackFrame frameOne, ICStackFrame frameTwo ) + protected static boolean equalFrame( ICDIStackFrame frameOne, ICDIStackFrame frameTwo ) { return ( frameOne.getParent().equals( frameTwo.getParent() ) && frameOne.getLocation().equals( frameTwo.getLocation() ) ); @@ -493,7 +493,7 @@ public class CStackFrame extends CDebugElement { return this; } - if ( adapter == ICStackFrame.class ) + if ( adapter == ICDIStackFrame.class ) { return getCDIStackFrame(); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CThread.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CThread.java index ad2d22f0432..9cd16f27f90 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CThread.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CThread.java @@ -15,22 +15,22 @@ import java.util.List; import org.eclipse.cdt.debug.core.IInstructionStep; import org.eclipse.cdt.debug.core.IState; import org.eclipse.cdt.debug.core.cdi.CDIException; -import org.eclipse.cdt.debug.core.cdi.ICBreakpoint; -import org.eclipse.cdt.debug.core.cdi.ICDebugConfiguration; -import org.eclipse.cdt.debug.core.cdi.ICEndSteppingRange; -import org.eclipse.cdt.debug.core.cdi.ICSessionObject; -import org.eclipse.cdt.debug.core.cdi.ICSignal; -import org.eclipse.cdt.debug.core.cdi.event.ICChangedEvent; -import org.eclipse.cdt.debug.core.cdi.event.ICDisconnectedEvent; -import org.eclipse.cdt.debug.core.cdi.event.ICEvent; -import org.eclipse.cdt.debug.core.cdi.event.ICEventListener; -import org.eclipse.cdt.debug.core.cdi.event.ICResumedEvent; -import org.eclipse.cdt.debug.core.cdi.event.ICSteppingEvent; -import org.eclipse.cdt.debug.core.cdi.event.ICSuspendedEvent; -import org.eclipse.cdt.debug.core.cdi.event.ICTerminatedEvent; -import org.eclipse.cdt.debug.core.cdi.model.ICObject; -import org.eclipse.cdt.debug.core.cdi.model.ICStackFrame; -import org.eclipse.cdt.debug.core.cdi.model.ICThread; +import org.eclipse.cdt.debug.core.cdi.ICDIBreakpoint; +import org.eclipse.cdt.debug.core.cdi.ICDIDebugConfiguration; +import org.eclipse.cdt.debug.core.cdi.ICDIEndSteppingRange; +import org.eclipse.cdt.debug.core.cdi.ICDISessionObject; +import org.eclipse.cdt.debug.core.cdi.ICDISignal; +import org.eclipse.cdt.debug.core.cdi.event.ICDIChangedEvent; +import org.eclipse.cdt.debug.core.cdi.event.ICDIDisconnectedEvent; +import org.eclipse.cdt.debug.core.cdi.event.ICDIEvent; +import org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener; +import org.eclipse.cdt.debug.core.cdi.event.ICDIResumedEvent; +import org.eclipse.cdt.debug.core.cdi.event.ICDISteppingEvent; +import org.eclipse.cdt.debug.core.cdi.event.ICDISuspendedEvent; +import org.eclipse.cdt.debug.core.cdi.event.ICDITerminatedEvent; +import org.eclipse.cdt.debug.core.cdi.model.ICDIObject; +import org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame; +import org.eclipse.cdt.debug.core.cdi.model.ICDIThread; import org.eclipse.debug.core.DebugEvent; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.model.IBreakpoint; @@ -47,12 +47,12 @@ public class CThread extends CDebugElement implements IThread, IState, IInstructionStep, - ICEventListener + ICDIEventListener { /** * Underlying CDI thread. */ - private ICThread fCDIThread; + private ICDIThread fCDIThread; /** * Collection of stack frames @@ -84,13 +84,13 @@ public class CThread extends CDebugElement /** * The debug configuration of this session. */ - private ICDebugConfiguration fConfig; + private ICDIDebugConfiguration fConfig; /** * Constructor for CThread. * @param target */ - public CThread( CDebugTarget target, ICThread cdiThread ) + public CThread( CDebugTarget target, ICDIThread cdiThread ) { super( target ); setCDIThread( cdiThread ); @@ -165,7 +165,7 @@ public class CThread extends CDebugElement return fStackFrames; } } - ICStackFrame[] frames = getCDIStackFrames(); + ICDIStackFrame[] frames = getCDIStackFrames(); // compute new or removed stack frames int offset = 0, length = frames.length; if ( length > fStackFrames.size() ) @@ -198,8 +198,8 @@ public class CThread extends CDebugElement { // same number of frames - if top frames are in different // method, replace all frames - ICStackFrame newTop = frames[0]; - ICStackFrame oldTop = ((CStackFrame)fStackFrames.get( 0 ) ).getLastCDIStackFrame(); + ICDIStackFrame newTop = frames[0]; + ICDIStackFrame oldTop = ((CStackFrame)fStackFrames.get( 0 ) ).getLastCDIStackFrame(); if (!CStackFrame.equalFrame( newTop, oldTop ) ) { fStackFrames = createAllStackFrames(); @@ -230,7 +230,7 @@ public class CThread extends CDebugElement *
    *
*/ - protected ICStackFrame[] getCDIStackFrames() throws DebugException + protected ICDIStackFrame[] getCDIStackFrames() throws DebugException { try { @@ -249,7 +249,7 @@ public class CThread extends CDebugElement * Replaces the underlying stack frame objects in the preserved frames * list with the current underlying stack frames. * - * @param newFrames list of current underlying ICStackFrames. + * @param newFrames list of current underlying ICDIStackFrames. * Frames from this list are assigned to the underlying frames in * the oldFrames list. * @param offset the offset in the lists at which to start replacing @@ -257,7 +257,7 @@ public class CThread extends CDebugElement * @param oldFrames list of preserved frames, of type CStackFrame * @param length the number of frames to replace */ - protected void updateStackFrames( ICStackFrame[] newFrames, + protected void updateStackFrames( ICDIStackFrame[] newFrames, int offset, List oldFrames, int length ) throws DebugException @@ -327,7 +327,7 @@ public class CThread extends CDebugElement */ protected List createAllStackFrames() throws DebugException { - ICStackFrame[] frames = getCDIStackFrames(); + ICDIStackFrame[] frames = getCDIStackFrames(); List list= new ArrayList( frames.length ); for ( int i = 0; i < frames.length; ++i ) { @@ -371,53 +371,53 @@ public class CThread extends CDebugElement } /* (non-Javadoc) - * @see org.eclipse.cdt.debug.core.cdi.event.ICEventListener#handleDebugEvent(ICEvent) + * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener#handleDebugEvent(ICDIEvent) */ - public void handleDebugEvent( ICEvent event ) + public void handleDebugEvent( ICDIEvent event ) { - ICObject source = event.getSource(); + ICDIObject source = event.getSource(); if ( source.getCDITarget().equals( getCDITarget() ) ) { - if ( event instanceof ICSuspendedEvent ) + if ( event instanceof ICDISuspendedEvent ) { - if ( source instanceof ICThread ) + if ( source instanceof ICDIThread ) { - handleSuspendedEvent( (ICSuspendedEvent)event ); + handleSuspendedEvent( (ICDISuspendedEvent)event ); } } - else if ( event instanceof ICResumedEvent ) + else if ( event instanceof ICDIResumedEvent ) { - if ( source instanceof ICThread ) + if ( source instanceof ICDIThread ) { - handleResumedEvent( (ICResumedEvent)event ); + handleResumedEvent( (ICDIResumedEvent)event ); } } - else if ( event instanceof ICTerminatedEvent ) + else if ( event instanceof ICDITerminatedEvent ) { - if ( source instanceof ICThread ) + if ( source instanceof ICDIThread ) { - handleTerminatedEvent( (ICTerminatedEvent)event ); + handleTerminatedEvent( (ICDITerminatedEvent)event ); } } - else if ( event instanceof ICDisconnectedEvent ) + else if ( event instanceof ICDIDisconnectedEvent ) { - if ( source instanceof ICThread ) + if ( source instanceof ICDIThread ) { - handleDisconnectedEvent( (ICDisconnectedEvent)event ); + handleDisconnectedEvent( (ICDIDisconnectedEvent)event ); } } - else if ( event instanceof ICChangedEvent ) + else if ( event instanceof ICDIChangedEvent ) { - if ( source instanceof ICThread ) + if ( source instanceof ICDIThread ) { - handleChangedEvent( (ICChangedEvent)event ); + handleChangedEvent( (ICDIChangedEvent)event ); } } - else if ( event instanceof ICSteppingEvent ) + else if ( event instanceof ICDISteppingEvent ) { - if ( source instanceof ICThread ) + if ( source instanceof ICDIThread ) { - handleSteppingEvent( (ICSteppingEvent)event ); + handleSteppingEvent( (ICDISteppingEvent)event ); } } } @@ -647,7 +647,7 @@ public class CThread extends CDebugElement * * @param thread the underlying CDI thread */ - protected void setCDIThread( ICThread cdiThread ) + protected void setCDIThread( ICDIThread cdiThread ) { fCDIThread = cdiThread; } @@ -658,7 +658,7 @@ public class CThread extends CDebugElement * * @return the underlying CDI thread */ - protected ICThread getCDIThread() + protected ICDIThread getCDIThread() { return fCDIThread; } @@ -821,27 +821,27 @@ public class CThread extends CDebugElement } } - private void handleSuspendedEvent( ICSuspendedEvent event ) + private void handleSuspendedEvent( ICDISuspendedEvent event ) { setRunning( false ); setCurrentStateId( IState.SUSPENDED ); - ICSessionObject reason = event.getReason(); + ICDISessionObject reason = event.getReason(); setCurrentStateInfo( reason ); - if ( reason instanceof ICEndSteppingRange ) + if ( reason instanceof ICDIEndSteppingRange ) { - handleEndSteppingRange( (ICEndSteppingRange)reason ); + handleEndSteppingRange( (ICDIEndSteppingRange)reason ); } - else if ( reason instanceof ICBreakpoint ) + else if ( reason instanceof ICDIBreakpoint ) { - handleBreakpointHit( (ICBreakpoint)reason ); + handleBreakpointHit( (ICDIBreakpoint)reason ); } - else if ( reason instanceof ICSignal ) + else if ( reason instanceof ICDISignal ) { - handleSuspendedBySignal( (ICSignal)reason ); + handleSuspendedBySignal( (ICDISignal)reason ); } } - private void handleResumedEvent( ICResumedEvent event ) + private void handleResumedEvent( ICDIResumedEvent event ) { setRunning( true ); setCurrentStateId( IState.RUNNING ); @@ -849,40 +849,40 @@ public class CThread extends CDebugElement fireResumeEvent( DebugEvent.UNSPECIFIED ); } - private void handleEndSteppingRange( ICEndSteppingRange endSteppingRange ) + private void handleEndSteppingRange( ICDIEndSteppingRange endSteppingRange ) { fireSuspendEvent( DebugEvent.UNSPECIFIED ); } - private void handleBreakpointHit( ICBreakpoint breakpoint ) + private void handleBreakpointHit( ICDIBreakpoint breakpoint ) { fireSuspendEvent( DebugEvent.BREAKPOINT ); } - private void handleSuspendedBySignal( ICSignal signal ) + private void handleSuspendedBySignal( ICDISignal signal ) { fireSuspendEvent( DebugEvent.UNSPECIFIED ); } - private void handleTerminatedEvent( ICTerminatedEvent event ) + private void handleTerminatedEvent( ICDITerminatedEvent event ) { setCurrentStateId( IState.TERMINATED ); setCurrentStateInfo( null ); terminated(); } - private void handleDisconnectedEvent( ICDisconnectedEvent event ) + private void handleDisconnectedEvent( ICDIDisconnectedEvent event ) { setCurrentStateId( IState.TERMINATED ); setCurrentStateInfo( null ); terminated(); } - private void handleChangedEvent( ICChangedEvent event ) + private void handleChangedEvent( ICDIChangedEvent event ) { } - private void handleSteppingEvent( ICSteppingEvent event ) + private void handleSteppingEvent( ICDISteppingEvent event ) { setCurrentStateId( IState.STEPPING ); setCurrentStateInfo( null ); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CValue.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CValue.java index c4aa79de478..cdc6aabb321 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CValue.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CValue.java @@ -6,7 +6,7 @@ package org.eclipse.cdt.debug.internal.core; -import org.eclipse.cdt.debug.core.cdi.model.ICValue; +import org.eclipse.cdt.debug.core.cdi.model.ICDIValue; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.model.IValue; import org.eclipse.debug.core.model.IVariable; @@ -22,13 +22,13 @@ public class CValue extends CDebugElement implements IValue /** * Underlying CDI value. */ - private ICValue fValue; + private ICDIValue fValue; /** * Constructor for CValue. * @param target */ - public CValue( CDebugTarget target, ICValue cdiValue ) + public CValue( CDebugTarget target, ICDIValue cdiValue ) { super( target ); fValue = cdiValue; @@ -78,7 +78,7 @@ public class CValue extends CDebugElement implements IValue * Creates the appropriate kind of value, or null. * */ - public static CValue createValue( CDebugTarget target, ICValue value ) + public static CValue createValue( CDebugTarget target, ICDIValue value ) { return new CValue( target, value ); } @@ -86,7 +86,7 @@ public class CValue extends CDebugElement implements IValue /** * Returns this value's underlying CDI value */ - protected ICValue getUnderlyingValue() + protected ICDIValue getUnderlyingValue() { return fValue; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CVariable.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CVariable.java index 96b5bf2103c..1605013e781 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CVariable.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CVariable.java @@ -8,8 +8,8 @@ package org.eclipse.cdt.debug.internal.core; import java.text.MessageFormat; import org.eclipse.cdt.debug.core.cdi.CDIException; -import org.eclipse.cdt.debug.core.cdi.event.ICEventListener; -import org.eclipse.cdt.debug.core.cdi.model.ICValue; +import org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener; +import org.eclipse.cdt.debug.core.cdi.model.ICDIValue; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.model.IValue; import org.eclipse.debug.core.model.IVariable; @@ -22,7 +22,7 @@ import org.eclipse.debug.core.model.IVariable; */ public abstract class CVariable extends CDebugElement implements IVariable, - ICEventListener + ICDIEventListener { /** * Cache of current value - see #getValue(). @@ -57,14 +57,14 @@ public abstract class CVariable extends CDebugElement */ public IValue getValue() throws DebugException { - ICValue currentValue = getCurrentValue(); + ICDIValue currentValue = getCurrentValue(); if ( fValue == null ) { fValue = CValue.createValue( (CDebugTarget)getDebugTarget(), currentValue ); } else { - ICValue previousValue = fValue.getUnderlyingValue(); + ICDIValue previousValue = fValue.getUnderlyingValue(); if ( currentValue == previousValue ) { return fValue; @@ -134,7 +134,7 @@ public abstract class CVariable extends CDebugElement /** * Returns this variable's underlying CDI value. */ - protected abstract ICValue retrieveValue() throws DebugException, CDIException; + protected abstract ICDIValue retrieveValue() throws DebugException, CDIException; /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(Class) @@ -154,7 +154,7 @@ public abstract class CVariable extends CDebugElement * * @exception DebugException if unable to access the value */ - protected final ICValue getCurrentValue() throws DebugException + protected final ICDIValue getCurrentValue() throws DebugException { try { @@ -193,7 +193,7 @@ public abstract class CVariable extends CDebugElement /** * Returns the last known value for this variable */ - protected ICValue getLastKnownValue() + protected ICDIValue getLastKnownValue() { if ( fValue == null ) { diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPlugin.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPlugin.java index 5bf2e3abc31..e47bf9f0fea 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPlugin.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPlugin.java @@ -8,7 +8,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import org.eclipse.cdt.debug.core.cdi.ICSession; +import org.eclipse.cdt.debug.core.cdi.ICDISession; import org.eclipse.cdt.debug.mi.core.cdi.CSession; import org.eclipse.cdt.debug.mi.core.command.CommandFactory; import org.eclipse.cdt.debug.mi.core.command.MITargetAttach; @@ -46,21 +46,21 @@ public class MIPlugin extends Plugin { return new MISession(in, out); } - public ICSession createCSession(String program) throws IOException { + public ICDISession createCSession(String program) throws IOException { String[]args = new String[]{"gdb", "--quiet", "-i", "mi", program}; Process gdb = Runtime.getRuntime().exec(args); MISession session = createMISession(gdb.getInputStream(), gdb.getOutputStream()); return new CSession(session); } - public ICSession createCSession(String program, String core) throws IOException { + public ICDISession createCSession(String program, String core) throws IOException { String[]args = new String[]{"gdb", "--quiet", "-i", "mi", program, core}; Process gdb = Runtime.getRuntime().exec(args); MISession session = createMISession(gdb.getInputStream(), gdb.getOutputStream()); return new CSession(session); } - public ICSession createCSession(String program, int pid) throws IOException { + public ICDISession createCSession(String program, int pid) throws IOException { String[]args = new String[]{"gdb", "--quiet", "-i", "mi", program}; Process gdb = Runtime.getRuntime().exec(args); MISession session = createMISession(gdb.getInputStream(), gdb.getOutputStream()); diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/Argument.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/Argument.java index ec57a1792e9..5c59cf12b55 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/Argument.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/Argument.java @@ -1,10 +1,10 @@ package org.eclipse.cdt.debug.mi.core.cdi; import org.eclipse.cdt.debug.core.cdi.CDIException; -import org.eclipse.cdt.debug.core.cdi.model.ICArgument; -import org.eclipse.cdt.debug.core.cdi.model.ICObject; -import org.eclipse.cdt.debug.core.cdi.model.ICTarget; -import org.eclipse.cdt.debug.core.cdi.model.ICValue; +import org.eclipse.cdt.debug.core.cdi.model.ICDIArgument; +import org.eclipse.cdt.debug.core.cdi.model.ICDIObject; +import org.eclipse.cdt.debug.core.cdi.model.ICDITarget; +import org.eclipse.cdt.debug.core.cdi.model.ICDIValue; import org.eclipse.cdt.debug.mi.core.output.MIArg; /** @@ -15,7 +15,7 @@ import org.eclipse.cdt.debug.mi.core.output.MIArg; * To enable and disable the creation of type comments go to * Window>Preferences>Java>Code Generation. */ -public class Argument implements ICArgument { +public class Argument implements ICDIArgument { MIArg arg; @@ -24,61 +24,61 @@ public class Argument implements ICArgument { } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICVariable#getName() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariable#getName() */ public String getName() throws CDIException { return arg.getName(); } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICVariable#getValue() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariable#getValue() */ - public ICValue getValue() throws CDIException { + public ICDIValue getValue() throws CDIException { return new Value(arg.getValue()); } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICVariable#hasValueChanged() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariable#hasValueChanged() */ public boolean hasValueChanged() throws CDIException { return false; } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICVariable#setValue(ICValue) + * @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariable#setValue(ICDIValue) */ - public void setValue(ICValue value) throws CDIException { + public void setValue(ICDIValue value) throws CDIException { } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICVariable#setValue(String) + * @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariable#setValue(String) */ public void setValue(String expression) throws CDIException { } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICObject#getCDITarget() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDIObject#getCDITarget() */ - public ICTarget getCDITarget() { + public ICDITarget getCDITarget() { return null; } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICObject#getId() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDIObject#getId() */ public String getId() { return null; } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICObject#getParent() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDIObject#getParent() */ - public ICObject getParent() { + public ICDIObject getParent() { return null; } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICVariable#getTypeName() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariable#getTypeName() */ public String getTypeName() throws CDIException { return ""; diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/Breakpoint.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/Breakpoint.java index 779a539ac21..87132cdd2de 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/Breakpoint.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/Breakpoint.java @@ -1,13 +1,13 @@ package org.eclipse.cdt.debug.mi.core.cdi; import org.eclipse.cdt.debug.core.cdi.CDIException; -import org.eclipse.cdt.debug.core.cdi.ICCatchEvent; -import org.eclipse.cdt.debug.core.cdi.ICCatchpoint; -import org.eclipse.cdt.debug.core.cdi.ICCondition; -import org.eclipse.cdt.debug.core.cdi.ICLocation; -import org.eclipse.cdt.debug.core.cdi.ICLocationBreakpoint; -import org.eclipse.cdt.debug.core.cdi.ICWatchpoint; -import org.eclipse.cdt.debug.core.cdi.model.ICInstruction; +import org.eclipse.cdt.debug.core.cdi.ICDICatchEvent; +import org.eclipse.cdt.debug.core.cdi.ICDICatchpoint; +import org.eclipse.cdt.debug.core.cdi.ICDICondition; +import org.eclipse.cdt.debug.core.cdi.ICDILocation; +import org.eclipse.cdt.debug.core.cdi.ICDILocationBreakpoint; +import org.eclipse.cdt.debug.core.cdi.ICDIWatchpoint; +import org.eclipse.cdt.debug.core.cdi.model.ICDIInstruction; import org.eclipse.cdt.debug.mi.core.output.MIBreakPoint; /** @@ -18,11 +18,11 @@ import org.eclipse.cdt.debug.mi.core.output.MIBreakPoint; * To enable and disable the creation of type comments go to * Window>Preferences>Java>Code Generation. */ -public class Breakpoint extends SessionObject implements ICLocationBreakpoint, - ICCatchpoint, ICWatchpoint { +public class Breakpoint extends SessionObject implements ICDILocationBreakpoint, + ICDICatchpoint, ICDIWatchpoint { - ICLocation location; - ICCondition condition; + ICDILocation location; + ICDICondition condition; MIBreakPoint miBreakPoint; BreakpointManager mgr; @@ -37,19 +37,19 @@ public class Breakpoint extends SessionObject implements ICLocationBreakpoint, } /** - * @see org.eclipse.cdt.debug.core.cdi.ICBreakpoint#getCondition() + * @see org.eclipse.cdt.debug.core.cdi.ICDIBreakpoint#getCondition() */ - public ICCondition getCondition() throws CDIException { + public ICDICondition getCondition() throws CDIException { if (condition == null) { - condition = new ICCondition () { + condition = new ICDICondition () { /** - * @see org.eclipse.cdt.debug.core.cdi.ICCondition#getIgnoreCount() + * @see org.eclipse.cdt.debug.core.cdi.ICDICondition#getIgnoreCount() */ public int getIgnoreCount() { return miBreakPoint.getIgnoreCount(); } /** - * @see org.eclipse.cdt.debug.core.cdi.ICCondition#getExpression() + * @see org.eclipse.cdt.debug.core.cdi.ICDICondition#getExpression() */ public String getExpression() { return miBreakPoint.getWhat(); @@ -60,42 +60,42 @@ public class Breakpoint extends SessionObject implements ICLocationBreakpoint, } /** - * @see org.eclipse.cdt.debug.core.cdi.ICBreakpoint#getThreadId() + * @see org.eclipse.cdt.debug.core.cdi.ICDIBreakpoint#getThreadId() */ public String getThreadId() throws CDIException { return miBreakPoint.getThreadId(); } /** - * @see org.eclipse.cdt.debug.core.cdi.ICBreakpoint#isEnabled() + * @see org.eclipse.cdt.debug.core.cdi.ICDIBreakpoint#isEnabled() */ public boolean isEnabled() throws CDIException { return miBreakPoint.isEnabled(); } /** - * @see org.eclipse.cdt.debug.core.cdi.ICBreakpoint#isHardware() + * @see org.eclipse.cdt.debug.core.cdi.ICDIBreakpoint#isHardware() */ public boolean isHardware() { return miBreakPoint.isHardware(); } /** - * @see org.eclipse.cdt.debug.core.cdi.ICBreakpoint#isTemporary() + * @see org.eclipse.cdt.debug.core.cdi.ICDIBreakpoint#isTemporary() */ public boolean isTemporary() { return miBreakPoint.isTemporary(); } /** - * @see org.eclipse.cdt.debug.core.cdi.ICBreakpoint#setCondition(ICCondition) + * @see org.eclipse.cdt.debug.core.cdi.ICDIBreakpoint#setCondition(ICDICondition) */ - public void setCondition(ICCondition condition) throws CDIException { + public void setCondition(ICDICondition condition) throws CDIException { this.condition = condition; } /** - * @see org.eclipse.cdt.debug.core.cdi.ICBreakpoint#setEnabled(boolean) + * @see org.eclipse.cdt.debug.core.cdi.ICDIBreakpoint#setEnabled(boolean) */ public void setEnabled(boolean enable) throws CDIException { if (enable == false && isEnabled() == true) { @@ -106,48 +106,48 @@ public class Breakpoint extends SessionObject implements ICLocationBreakpoint, } /** - * @see org.eclipse.cdt.debug.core.cdi.ICLocationBreakpoint#getLocation() + * @see org.eclipse.cdt.debug.core.cdi.ICDILocationBreakpoint#getLocation() */ - public ICLocation getLocation() throws CDIException { + public ICDILocation getLocation() throws CDIException { if (location == null) { - location = new ICLocation () { + location = new ICDILocation () { /** - * @see org.eclipse.cdt.debug.core.cdi.ICLocation#getAddress() + * @see org.eclipse.cdt.debug.core.cdi.ICDILocation#getAddress() */ public long getAddress() { return miBreakPoint.getAddress(); } /** - * @see org.eclipse.cdt.debug.core.cdi.ICLocation#getFile() + * @see org.eclipse.cdt.debug.core.cdi.ICDILocation#getFile() */ public String getFile() { return miBreakPoint.getFile(); } /** - * @see org.eclipse.cdt.debug.core.cdi.ICLocation#getFunction() + * @see org.eclipse.cdt.debug.core.cdi.ICDILocation#getFunction() */ public String getFunction() { return miBreakPoint.getFunction(); } /** - * @see org.eclipse.cdt.debug.core.cdi.ICLocation#getLineNumber() + * @see org.eclipse.cdt.debug.core.cdi.ICDILocation#getLineNumber() */ public int getLineNumber() { return miBreakPoint.getLine(); } /** - * @see org.eclipse.cdt.debug.core.cdi.ICLocation#getInstructions(int) + * @see org.eclipse.cdt.debug.core.cdi.ICDILocation#getInstructions(int) */ - public ICInstruction[] getInstructions(int maxCount) + public ICDIInstruction[] getInstructions(int maxCount) throws CDIException { - return new ICInstruction[0]; + return new ICDIInstruction[0]; } /** - * @see org.eclipse.cdt.debug.core.cdi.ICLocation#getInstructions() + * @see org.eclipse.cdt.debug.core.cdi.ICDILocation#getInstructions() */ - public ICInstruction[] getInstructions() throws CDIException { - return new ICInstruction[0]; + public ICDIInstruction[] getInstructions() throws CDIException { + return new ICDIInstruction[0]; } }; @@ -156,28 +156,28 @@ public class Breakpoint extends SessionObject implements ICLocationBreakpoint, } /** - * @see org.eclipse.cdt.debug.core.cdi.ICCatchpoint#getEvent() + * @see org.eclipse.cdt.debug.core.cdi.ICDICatchpoint#getEvent() */ - public ICCatchEvent getEvent() throws CDIException { + public ICDICatchEvent getEvent() throws CDIException { return null; } /** - * @see org.eclipse.cdt.debug.core.cdi.ICWatchpoint#getWatchExpression() + * @see org.eclipse.cdt.debug.core.cdi.ICDIWatchpoint#getWatchExpression() */ public String getWatchExpression() throws CDIException { return miBreakPoint.getWhat(); } /** - * @see org.eclipse.cdt.debug.core.cdi.ICWatchpoint#isReadType() + * @see org.eclipse.cdt.debug.core.cdi.ICDIWatchpoint#isReadType() */ public boolean isReadType() { return miBreakPoint.isReadWatchpoint(); } /** - * @see org.eclipse.cdt.debug.core.cdi.ICWatchpoint#isWriteType() + * @see org.eclipse.cdt.debug.core.cdi.ICDIWatchpoint#isWriteType() */ public boolean isWriteType() { return miBreakPoint.isAccessWatchpoint(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java index c652b82637e..812c90231df 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java @@ -9,14 +9,14 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.cdt.debug.core.cdi.CDIException; -import org.eclipse.cdt.debug.core.cdi.ICBreakpoint; -import org.eclipse.cdt.debug.core.cdi.ICBreakpointManager; -import org.eclipse.cdt.debug.core.cdi.ICCatchEvent; -import org.eclipse.cdt.debug.core.cdi.ICCatchpoint; -import org.eclipse.cdt.debug.core.cdi.ICCondition; -import org.eclipse.cdt.debug.core.cdi.ICLocation; -import org.eclipse.cdt.debug.core.cdi.ICLocationBreakpoint; -import org.eclipse.cdt.debug.core.cdi.ICWatchpoint; +import org.eclipse.cdt.debug.core.cdi.ICDIBreakpoint; +import org.eclipse.cdt.debug.core.cdi.ICDIBreakpointManager; +import org.eclipse.cdt.debug.core.cdi.ICDICatchEvent; +import org.eclipse.cdt.debug.core.cdi.ICDICatchpoint; +import org.eclipse.cdt.debug.core.cdi.ICDICondition; +import org.eclipse.cdt.debug.core.cdi.ICDILocation; +import org.eclipse.cdt.debug.core.cdi.ICDILocationBreakpoint; +import org.eclipse.cdt.debug.core.cdi.ICDIWatchpoint; import org.eclipse.cdt.debug.mi.core.MIException; import org.eclipse.cdt.debug.mi.core.command.CommandFactory; import org.eclipse.cdt.debug.mi.core.command.MIBreakDelete; @@ -32,7 +32,7 @@ import org.eclipse.cdt.debug.mi.core.output.MIInfo; /** * */ -public class BreakpointManager extends SessionObject implements ICBreakpointManager { +public class BreakpointManager extends SessionObject implements ICDIBreakpointManager { List breakList; @@ -42,23 +42,23 @@ public class BreakpointManager extends SessionObject implements ICBreakpointMana } /** - * @see org.eclipse.cdt.debug.core.cdi.ICBreakpointManager#deleteAllBreakpoints() + * @see org.eclipse.cdt.debug.core.cdi.ICDIBreakpointManager#deleteAllBreakpoints() */ public void deleteAllBreakpoints() throws CDIException { deleteBreakpoints(getBreakpoints()); } /** - * @see org.eclipse.cdt.debug.core.cdi.ICBreakpointManager#deleteBreakpoint(ICBreakpoint) + * @see org.eclipse.cdt.debug.core.cdi.ICDIBreakpointManager#deleteBreakpoint(ICDIBreakpoint) */ - public void deleteBreakpoint(ICBreakpoint breakpoint) throws CDIException { - deleteBreakpoints(new ICBreakpoint[]{breakpoint}); + public void deleteBreakpoint(ICDIBreakpoint breakpoint) throws CDIException { + deleteBreakpoints(new ICDIBreakpoint[]{breakpoint}); } /** - * @see org.eclipse.cdt.debug.core.cdi.ICBreakpointManager#deleteBreakpoints(ICBreakpoint[]) + * @see org.eclipse.cdt.debug.core.cdi.ICDIBreakpointManager#deleteBreakpoints(ICDIBreakpoint[]) */ - public void deleteBreakpoints(ICBreakpoint[] breakpoints) throws CDIException { + public void deleteBreakpoints(ICDIBreakpoint[] breakpoints) throws CDIException { int[] numbers = new int[breakpoints.length]; for (int i = 0; i < numbers.length; i++) { if (breakpoints[i] instanceof Breakpoint @@ -85,7 +85,7 @@ public class BreakpointManager extends SessionObject implements ICBreakpointMana } } - public void enableBreakpoint(ICBreakpoint breakpoint) throws CDIException { + public void enableBreakpoint(ICDIBreakpoint breakpoint) throws CDIException { int number = 0; if (breakpoint instanceof Breakpoint && breakList.contains(breakpoint)) { number = ((Breakpoint)breakpoint).getMIBreakPoint().getNumber(); @@ -107,7 +107,7 @@ public class BreakpointManager extends SessionObject implements ICBreakpointMana ((Breakpoint)breakpoint).getMIBreakPoint().setEnabled(true); } - public void disableBreakpoint(ICBreakpoint breakpoint) throws CDIException { + public void disableBreakpoint(ICDIBreakpoint breakpoint) throws CDIException { int number = 0; if (breakpoint instanceof Breakpoint && breakList.contains(breakpoint)) { number = ((Breakpoint)breakpoint).getMIBreakPoint().getNumber(); @@ -130,29 +130,29 @@ public class BreakpointManager extends SessionObject implements ICBreakpointMana } /** - * @see org.eclipse.cdt.debug.core.cdi.ICBreakpointManager#getBreakpoints() + * @see org.eclipse.cdt.debug.core.cdi.ICDIBreakpointManager#getBreakpoints() */ - public ICBreakpoint[] getBreakpoints() throws CDIException { - return (ICBreakpoint[])breakList.toArray(new ICBreakpoint[breakList.size()]); + public ICDIBreakpoint[] getBreakpoints() throws CDIException { + return (ICDIBreakpoint[])breakList.toArray(new ICDIBreakpoint[breakList.size()]); } /** - * @see org.eclipse.cdt.debug.core.cdi.ICBreakpointManager#setCatchpoint(int, ICCatchEvent, String, ICCondition, boolean) + * @see org.eclipse.cdt.debug.core.cdi.ICDIBreakpointManager#setCatchpoint(int, ICDICatchEvent, String, ICDICondition, boolean) */ - public ICCatchpoint setCatchpoint(int type, ICCatchEvent event, String expression, - ICCondition condition) throws CDIException { + public ICDICatchpoint setCatchpoint(int type, ICDICatchEvent event, String expression, + ICDICondition condition) throws CDIException { // throw new CDIException(); return null; } /** - * @see org.eclipse.cdt.debug.core.cdi.ICBreakpointManager#setLocationBreakpoint(int, ICLocation, ICCondition, boolean, String) + * @see org.eclipse.cdt.debug.core.cdi.ICDIBreakpointManager#setLocationBreakpoint(int, ICDILocation, ICDICondition, boolean, String) */ - public ICLocationBreakpoint setLocationBreakpoint(int type, ICLocation location, - ICCondition condition, String threadId) throws CDIException { + public ICDILocationBreakpoint setLocationBreakpoint(int type, ICDILocation location, + ICDICondition condition, String threadId) throws CDIException { - boolean hardware = (type == ICBreakpoint.HARDWARE); - boolean temporary = (type == ICBreakpoint.TEMPORARY); + boolean hardware = (type == ICDIBreakpoint.HARDWARE); + boolean temporary = (type == ICDIBreakpoint.TEMPORARY); String exprCond = null; int ignoreCount = 0; String line = ""; @@ -200,12 +200,12 @@ public class BreakpointManager extends SessionObject implements ICBreakpointMana } /** - * @see org.eclipse.cdt.debug.core.cdi.ICBreakpointManager#setWatchpoint(int, int, String, ICCondition, boolean) + * @see org.eclipse.cdt.debug.core.cdi.ICDIBreakpointManager#setWatchpoint(int, int, String, ICDICondition, boolean) */ - public ICWatchpoint setWatchpoint(int type, int watchType, String expression, - ICCondition condition) throws CDIException { - boolean access = (type == ICWatchpoint.WRITE); - boolean read = (type == ICWatchpoint.READ); + public ICDIWatchpoint setWatchpoint(int type, int watchType, String expression, + ICDICondition condition) throws CDIException { + boolean access = (type == ICDIWatchpoint.WRITE); + boolean read = (type == ICDIWatchpoint.READ); CSession s = getCSession(); CommandFactory factory = s.getMISession().getCommandFactory(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/CSession.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/CSession.java index c377292b447..d535636a121 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/CSession.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/CSession.java @@ -9,22 +9,22 @@ package org.eclipse.cdt.debug.mi.core.cdi; import java.util.Properties; import org.eclipse.cdt.debug.core.cdi.CDIException; -import org.eclipse.cdt.debug.core.cdi.ICBreakpointManager; -import org.eclipse.cdt.debug.core.cdi.ICDebugConfiguration; -import org.eclipse.cdt.debug.core.cdi.ICEventManager; -import org.eclipse.cdt.debug.core.cdi.ICExpressionManager; -import org.eclipse.cdt.debug.core.cdi.ICMemoryManager; -import org.eclipse.cdt.debug.core.cdi.ICRuntimeOptions; -import org.eclipse.cdt.debug.core.cdi.ICSession; -import org.eclipse.cdt.debug.core.cdi.ICSignalManager; -import org.eclipse.cdt.debug.core.cdi.ICSourceManager; -import org.eclipse.cdt.debug.core.cdi.model.ICTarget; +import org.eclipse.cdt.debug.core.cdi.ICDIBreakpointManager; +import org.eclipse.cdt.debug.core.cdi.ICDIDebugConfiguration; +import org.eclipse.cdt.debug.core.cdi.ICDIEventManager; +import org.eclipse.cdt.debug.core.cdi.ICDIExpressionManager; +import org.eclipse.cdt.debug.core.cdi.ICDIMemoryManager; +import org.eclipse.cdt.debug.core.cdi.ICDIRuntimeOptions; +import org.eclipse.cdt.debug.core.cdi.ICDISession; +import org.eclipse.cdt.debug.core.cdi.ICDISignalManager; +import org.eclipse.cdt.debug.core.cdi.ICDISourceManager; +import org.eclipse.cdt.debug.core.cdi.model.ICDITarget; import org.eclipse.cdt.debug.mi.core.MISession; /** - * @see org.eclipse.cdt.debug.core.cdi.ICSession + * @see org.eclipse.cdt.debug.core.cdi.ICDISession */ -public class CSession implements ICSession { +public class CSession implements ICDISession { Properties props; MISession session; @@ -53,81 +53,81 @@ public class CSession implements ICSession { } /** - * @see org.eclipse.cdt.debug.core.cdi.ICSession#getAttribute(String) + * @see org.eclipse.cdt.debug.core.cdi.ICDISession#getAttribute(String) */ public String getAttribute(String key) { return props.getProperty(key); } /** - * @see org.eclipse.cdt.debug.core.cdi.ICSession#getBreakpointManager() + * @see org.eclipse.cdt.debug.core.cdi.ICDISession#getBreakpointManager() */ - public ICBreakpointManager getBreakpointManager() { + public ICDIBreakpointManager getBreakpointManager() { return breakpointManager; } /** - * @see org.eclipse.cdt.debug.core.cdi.ICSession#getEventManager() + * @see org.eclipse.cdt.debug.core.cdi.ICDISession#getEventManager() */ - public ICEventManager getEventManager() { + public ICDIEventManager getEventManager() { return eventManager; } /** - * @see org.eclipse.cdt.debug.core.cdi.ICSession#getExpressionManager() + * @see org.eclipse.cdt.debug.core.cdi.ICDISession#getExpressionManager() */ - public ICExpressionManager getExpressionManager() { + public ICDIExpressionManager getExpressionManager() { return expressionManager; } /** - * @see org.eclipse.cdt.debug.core.cdi.ICSession#getMemoryManager() + * @see org.eclipse.cdt.debug.core.cdi.ICDISession#getMemoryManager() */ - public ICMemoryManager getMemoryManager() { + public ICDIMemoryManager getMemoryManager() { return memoryManager; } /** - * @see org.eclipse.cdt.debug.core.cdi.ICSession#getSignalManager() + * @see org.eclipse.cdt.debug.core.cdi.ICDISession#getSignalManager() */ - public ICSignalManager getSignalManager() { + public ICDISignalManager getSignalManager() { return signalManager; } /** - * @see org.eclipse.cdt.debug.core.cdi.ICSession#getSourceManager() + * @see org.eclipse.cdt.debug.core.cdi.ICDISession#getSourceManager() */ - public ICSourceManager getSourceManager() { + public ICDISourceManager getSourceManager() { return sourceManager; } /** - * @see org.eclipse.cdt.debug.core.cdi.ICSession#getTargets() + * @see org.eclipse.cdt.debug.core.cdi.ICDISession#getTargets() */ - public ICTarget[] getTargets() { - return new ICTarget[]{ctarget}; + public ICDITarget[] getTargets() { + return new ICDITarget[]{ctarget}; } - public ICTarget getCTarget() { + public ICDITarget getCTarget() { return ctarget; } /** - * @see org.eclipse.cdt.debug.core.cdi.ICSession#isTerminated() + * @see org.eclipse.cdt.debug.core.cdi.ICDISession#isTerminated() */ public boolean isTerminated() { return session.isTerminated(); } /** - * @see org.eclipse.cdt.debug.core.cdi.ICSession#setAttribute(String, String) + * @see org.eclipse.cdt.debug.core.cdi.ICDISession#setAttribute(String, String) */ public void setAttribute(String key, String value) { props.setProperty(key, value); } /** - * @see org.eclipse.cdt.debug.core.cdi.ICSession#terminate() + * @see org.eclipse.cdt.debug.core.cdi.ICDISession#terminate() */ public void terminate() throws CDIException { session.terminate(); @@ -136,14 +136,14 @@ public class CSession implements ICSession { /** * @see org.eclipse.cdt.debug.core.cdi.ICSuration() */ - public ICDebugConfiguration getConfiguration() { + public ICDIDebugConfiguration getConfiguration() { return new DebugConfiguration(); } /** - * @see org.eclipse.cdt.debug.core.cdi.ICSession#getRuntimeOptions() + * @see org.eclipse.cdt.debug.core.cdi.ICDISession#getRuntimeOptions() */ - public ICRuntimeOptions getRuntimeOptions() { + public ICDIRuntimeOptions getRuntimeOptions() { return new RuntimeOptions(); } } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/CTarget.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/CTarget.java index 75eceff635b..4454f58e2c7 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/CTarget.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/CTarget.java @@ -9,15 +9,15 @@ import java.io.InputStream; import java.io.OutputStream; import org.eclipse.cdt.debug.core.cdi.CDIException; -import org.eclipse.cdt.debug.core.cdi.model.ICExpression; -import org.eclipse.cdt.debug.core.cdi.model.ICGlobalVariable; -import org.eclipse.cdt.debug.core.cdi.model.ICMemoryBlock; -import org.eclipse.cdt.debug.core.cdi.model.ICObject; -import org.eclipse.cdt.debug.core.cdi.model.ICRegisterGroup; -import org.eclipse.cdt.debug.core.cdi.model.ICSharedLibrary; -import org.eclipse.cdt.debug.core.cdi.model.ICTarget; -import org.eclipse.cdt.debug.core.cdi.model.ICThread; -import org.eclipse.cdt.debug.core.cdi.model.ICValue; +import org.eclipse.cdt.debug.core.cdi.model.ICDIExpression; +import org.eclipse.cdt.debug.core.cdi.model.ICDIGlobalVariable; +import org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlock; +import org.eclipse.cdt.debug.core.cdi.model.ICDIObject; +import org.eclipse.cdt.debug.core.cdi.model.ICDIRegisterGroup; +import org.eclipse.cdt.debug.core.cdi.model.ICDISharedLibrary; +import org.eclipse.cdt.debug.core.cdi.model.ICDITarget; +import org.eclipse.cdt.debug.core.cdi.model.ICDIThread; +import org.eclipse.cdt.debug.core.cdi.model.ICDIValue; import org.eclipse.cdt.debug.mi.core.MIException; import org.eclipse.cdt.debug.mi.core.MISession; import org.eclipse.cdt.debug.mi.core.command.CommandFactory; @@ -40,14 +40,14 @@ import org.eclipse.cdt.debug.mi.core.output.MIInfo; * To enable and disable the creation of type comments go to * Window>Preferences>Java>Code Generation. */ -public class CTarget extends SessionObject implements ICTarget { +public class CTarget extends SessionObject implements ICDITarget { public CTarget(CSession session) { super(session); } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICTarget#disconnect() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#disconnect() */ public void disconnect() throws CDIException { MISession mi = getCSession().getMISession(); @@ -65,22 +65,22 @@ public class CTarget extends SessionObject implements ICTarget { } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICTarget#evaluateExpression(ICExpression) + * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#evaluateExpression(ICDIExpression) */ - public void evaluateExpression(ICExpression expression) + public void evaluateExpression(ICDIExpression expression) throws CDIException { } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICTarget#evaluateExpression(String) + * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#evaluateExpression(String) */ - public ICExpression evaluateExpression(String expressionText) + public ICDIExpression evaluateExpression(String expressionText) throws CDIException { return null; } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICTarget#finish() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#finish() */ public void finish() throws CDIException { MISession mi = getCSession().getMISession(); @@ -98,99 +98,99 @@ public class CTarget extends SessionObject implements ICTarget { } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICTarget#getCMemoryBlock(long, long) + * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#getCMemoryBlock(long, long) */ - public ICMemoryBlock getCMemoryBlock(long startAddress, long length) + public ICDIMemoryBlock getCMemoryBlock(long startAddress, long length) throws CDIException { return null; } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICTarget#getErrorStream() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#getErrorStream() */ public InputStream getErrorStream() { return getCSession().getMISession().getMIProcess().getErrorStream(); } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICTarget#getInputStream() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#getInputStream() */ public InputStream getInputStream() { return getCSession().getMISession().getMIProcess().getInputStream(); } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICTarget#getOutputStream() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#getOutputStream() */ public OutputStream getOutputStream() { return getCSession().getMISession().getMIProcess().getOutputStream(); } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICTarget#getGlobalVariables() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#getGlobalVariables() */ - public ICGlobalVariable[] getGlobalVariables() throws CDIException { + public ICDIGlobalVariable[] getGlobalVariables() throws CDIException { return null; } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICTarget#getRegisterGroups() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#getRegisterGroups() */ - public ICRegisterGroup[] getRegisterGroups() throws CDIException { + public ICDIRegisterGroup[] getRegisterGroups() throws CDIException { return null; } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICTarget#getSharedLibraries() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#getSharedLibraries() */ - public ICSharedLibrary[] getSharedLibraries() throws CDIException { - return new ICSharedLibrary[0]; + public ICDISharedLibrary[] getSharedLibraries() throws CDIException { + return new ICDISharedLibrary[0]; } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICTarget#getThread(String) + * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#getThread(String) */ - public ICThread getThread(String id) throws CDIException { + public ICDIThread getThread(String id) throws CDIException { return null; } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICTarget#getThreads() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#getThreads() */ - public ICThread[] getThreads() throws CDIException { + public ICDIThread[] getThreads() throws CDIException { return null; } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICTarget#isDisconnected() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#isDisconnected() */ public boolean isDisconnected() { return false; } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICTarget#isStepping() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#isStepping() */ public boolean isStepping() { return getCSession().getMISession().getMIProcess().isRunning(); } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICTarget#isSuspended() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#isSuspended() */ public boolean isSuspended() { return getCSession().getMISession().getMIProcess().isSuspended(); } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICTarget#isTerminated() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#isTerminated() */ public boolean isTerminated() { return getCSession().getMISession().getMIProcess().isTerminated(); } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICTarget#restart() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#restart() */ public void restart() throws CDIException { MISession mi = getCSession().getMISession(); @@ -208,7 +208,7 @@ public class CTarget extends SessionObject implements ICTarget { } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICTarget#resume() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#resume() */ public void resume() throws CDIException { MISession mi = getCSession().getMISession(); @@ -230,7 +230,7 @@ public class CTarget extends SessionObject implements ICTarget { } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICTarget#stepInto() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#stepInto() */ public void stepInto() throws CDIException { MISession mi = getCSession().getMISession(); @@ -248,7 +248,7 @@ public class CTarget extends SessionObject implements ICTarget { } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICTarget#stepIntoInstruction() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#stepIntoInstruction() */ public void stepIntoInstruction() throws CDIException { MISession mi = getCSession().getMISession(); @@ -266,7 +266,7 @@ public class CTarget extends SessionObject implements ICTarget { } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICTarget#stepOver() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#stepOver() */ public void stepOver() throws CDIException { MISession mi = getCSession().getMISession(); @@ -284,7 +284,7 @@ public class CTarget extends SessionObject implements ICTarget { } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICTarget#stepOverInstruction() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#stepOverInstruction() */ public void stepOverInstruction() throws CDIException { MISession mi = getCSession().getMISession(); @@ -302,7 +302,7 @@ public class CTarget extends SessionObject implements ICTarget { } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICTarget#suspend() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#suspend() */ public void suspend() throws CDIException { MISession mi = getCSession().getMISession(); @@ -320,35 +320,35 @@ public class CTarget extends SessionObject implements ICTarget { } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICTarget#terminate() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#terminate() */ public void terminate() throws CDIException { getCSession().getMISession().getMIProcess().destroy(); } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICObject#getCDITarget() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDIObject#getCDITarget() */ - public ICTarget getCDITarget() { + public ICDITarget getCDITarget() { return this; } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICObject#getId() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDIObject#getId() */ public String getId() { return null; } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICObject#getParent() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDIObject#getParent() */ - public ICObject getParent() { + public ICDIObject getParent() { return null; } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICTarget#evaluateExpressionToString(String) + * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#evaluateExpressionToString(String) */ public String evaluateExpressionToString(String expressionText) throws CDIException { @@ -356,9 +356,9 @@ public class CTarget extends SessionObject implements ICTarget { } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICTarget#evaluateExpressionToValue(String) + * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#evaluateExpressionToValue(String) */ - public ICValue evaluateExpressionToValue(String expressionText) + public ICDIValue evaluateExpressionToValue(String expressionText) throws CDIException { return null; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/DebugConfiguration.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/DebugConfiguration.java index 44d2981280c..ff8fbe3ee37 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/DebugConfiguration.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/DebugConfiguration.java @@ -1,6 +1,6 @@ package org.eclipse.cdt.debug.mi.core.cdi; -import org.eclipse.cdt.debug.core.cdi.ICDebugConfiguration; +import org.eclipse.cdt.debug.core.cdi.ICDIDebugConfiguration; /** * @author alain @@ -10,87 +10,87 @@ import org.eclipse.cdt.debug.core.cdi.ICDebugConfiguration; * To enable and disable the creation of type comments go to * Window>Preferences>Java>Code Generation. */ -public class DebugConfiguration implements ICDebugConfiguration { +public class DebugConfiguration implements ICDIDebugConfiguration { /** - * @see org.eclipse.cdt.debug.core.cdi.ICDebugConfiguration#supportsBreakpoints() + * @see org.eclipse.cdt.debug.core.cdi.ICDIDebugConfiguration#supportsBreakpoints() */ public boolean supportsBreakpoints() { return false; } /** - * @see org.eclipse.cdt.debug.core.cdi.ICDebugConfiguration#supportsDisconnect() + * @see org.eclipse.cdt.debug.core.cdi.ICDIDebugConfiguration#supportsDisconnect() */ public boolean supportsDisconnect() { return false; } /** - * @see org.eclipse.cdt.debug.core.cdi.ICDebugConfiguration#supportsExpressionEvaluation() + * @see org.eclipse.cdt.debug.core.cdi.ICDIDebugConfiguration#supportsExpressionEvaluation() */ public boolean supportsExpressionEvaluation() { return false; } /** - * @see org.eclipse.cdt.debug.core.cdi.ICDebugConfiguration#supportsInstructionStepping() + * @see org.eclipse.cdt.debug.core.cdi.ICDIDebugConfiguration#supportsInstructionStepping() */ public boolean supportsInstructionStepping() { return false; } /** - * @see org.eclipse.cdt.debug.core.cdi.ICDebugConfiguration#supportsMemoryModification() + * @see org.eclipse.cdt.debug.core.cdi.ICDIDebugConfiguration#supportsMemoryModification() */ public boolean supportsMemoryModification() { return false; } /** - * @see org.eclipse.cdt.debug.core.cdi.ICDebugConfiguration#supportsMemoryRetrieval() + * @see org.eclipse.cdt.debug.core.cdi.ICDIDebugConfiguration#supportsMemoryRetrieval() */ public boolean supportsMemoryRetrieval() { return false; } /** - * @see org.eclipse.cdt.debug.core.cdi.ICDebugConfiguration#supportsRegisterModification() + * @see org.eclipse.cdt.debug.core.cdi.ICDIDebugConfiguration#supportsRegisterModification() */ public boolean supportsRegisterModification() { return false; } /** - * @see org.eclipse.cdt.debug.core.cdi.ICDebugConfiguration#supportsRegisters() + * @see org.eclipse.cdt.debug.core.cdi.ICDIDebugConfiguration#supportsRegisters() */ public boolean supportsRegisters() { return false; } /** - * @see org.eclipse.cdt.debug.core.cdi.ICDebugConfiguration#supportsRestart() + * @see org.eclipse.cdt.debug.core.cdi.ICDIDebugConfiguration#supportsRestart() */ public boolean supportsRestart() { return false; } /** - * @see org.eclipse.cdt.debug.core.cdi.ICDebugConfiguration#supportsStepping() + * @see org.eclipse.cdt.debug.core.cdi.ICDIDebugConfiguration#supportsStepping() */ public boolean supportsStepping() { return false; } /** - * @see org.eclipse.cdt.debug.core.cdi.ICDebugConfiguration#supportsSuspendResume() + * @see org.eclipse.cdt.debug.core.cdi.ICDIDebugConfiguration#supportsSuspendResume() */ public boolean supportsSuspendResume() { return false; } /** - * @see org.eclipse.cdt.debug.core.cdi.ICDebugConfiguration#supportsTerminate() + * @see org.eclipse.cdt.debug.core.cdi.ICDIDebugConfiguration#supportsTerminate() */ public boolean supportsTerminate() { return false; diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/EventAdapter.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/EventAdapter.java index cda2d729eaf..7660066a98e 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/EventAdapter.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/EventAdapter.java @@ -1,6 +1,6 @@ package org.eclipse.cdt.debug.mi.core.cdi; -import org.eclipse.cdt.debug.core.cdi.event.ICEvent; +import org.eclipse.cdt.debug.core.cdi.event.ICDIEvent; import org.eclipse.cdt.debug.mi.core.event.MIBreakpointEvent; import org.eclipse.cdt.debug.mi.core.event.MIEvent; import org.eclipse.cdt.debug.mi.core.event.MIExitEvent; @@ -21,7 +21,7 @@ import org.eclipse.cdt.debug.mi.core.event.MIWatchpointEvent; */ public class EventAdapter { - public static ICEvent getCEvent(final CSession session, final MIEvent miEvent) { + public static ICDIEvent getCEvent(final CSession session, final MIEvent miEvent) { if (miEvent instanceof MIBreakpointEvent) { return new SuspendedEvent(session, (MIBreakpointEvent)miEvent); } else if (miEvent instanceof MIInferiorExitEvent) { diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/EventManager.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/EventManager.java index 3a8544c570c..76e1434beb4 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/EventManager.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/EventManager.java @@ -11,8 +11,8 @@ import java.util.Map; import java.util.Observable; import java.util.Observer; -import org.eclipse.cdt.debug.core.cdi.ICEventManager; -import org.eclipse.cdt.debug.core.cdi.event.ICEventListener; +import org.eclipse.cdt.debug.core.cdi.ICDIEventManager; +import org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener; import org.eclipse.cdt.debug.mi.core.MISession; import org.eclipse.cdt.debug.mi.core.event.MIEvent; @@ -24,13 +24,13 @@ import org.eclipse.cdt.debug.mi.core.event.MIEvent; * To enable and disable the creation oEventManagerts go to * Window>Preferences>Java>Code Generation. */ -public class EventManager extends SessionObject implements ICEventManager { +public class EventManager extends SessionObject implements ICDIEventManager { Map map = Collections.synchronizedMap(new HashMap()); class CDIObserver implements Observer { - ICEventListener listener; - public CDIObserver(ICEventListener l) { + ICDIEventListener listener; + public CDIObserver(ICDIEventListener l) { listener = l; } public void update(Observable o, Object args) { @@ -46,9 +46,9 @@ public class EventManager extends SessionObject implements ICEventManager { } /** - * @see org.eclipse.cdt.debug.core.cdi.ICEventManager#addEventListener(ICEventListener) + * @see org.eclipse.cdt.debug.core.cdi.ICDIEventManager#addEventListener(ICDIEventListener) */ - public void addEventListener(ICEventListener listener) { + public void addEventListener(ICDIEventListener listener) { CDIObserver cdiObserver = new CDIObserver(listener); map.put(listener, cdiObserver); MISession session = getCSession().getMISession(); @@ -56,9 +56,9 @@ public class EventManager extends SessionObject implements ICEventManager { } /** - * @see org.eclipse.cdt.debug.core.cdi.ICEventManager#removeEventListener(ICEventListener) + * @see org.eclipse.cdt.debug.core.cdi.ICDIEventManager#removeEventListener(ICDIEventListener) */ - public void removeEventListener(ICEventListener listener) { + public void removeEventListener(ICDIEventListener listener) { CDIObserver cdiObserver = (CDIObserver)map.remove(listener); if (cdiObserver != null) { MISession session = getCSession().getMISession(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/Expression.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/Expression.java index fb6a1bad5dd..79ab5cb8232 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/Expression.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/Expression.java @@ -1,10 +1,10 @@ package org.eclipse.cdt.debug.mi.core.cdi; import org.eclipse.cdt.debug.core.cdi.CDIException; -import org.eclipse.cdt.debug.core.cdi.model.ICExpression; -import org.eclipse.cdt.debug.core.cdi.model.ICObject; -import org.eclipse.cdt.debug.core.cdi.model.ICTarget; -import org.eclipse.cdt.debug.core.cdi.model.ICValue; +import org.eclipse.cdt.debug.core.cdi.model.ICDIExpression; +import org.eclipse.cdt.debug.core.cdi.model.ICDIObject; +import org.eclipse.cdt.debug.core.cdi.model.ICDITarget; +import org.eclipse.cdt.debug.core.cdi.model.ICDIValue; /** * @author alain @@ -14,40 +14,40 @@ import org.eclipse.cdt.debug.core.cdi.model.ICValue; * To enable and disable the creation of type comments go to * Window>Preferences>Java>Code Generation. */ -public class Expression implements ICExpression { +public class Expression implements ICDIExpression { /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICExpression#getExpressionText() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExpression#getExpressionText() */ public String getExpressionText() { return null; } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICExpression#getValue() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExpression#getValue() */ - public ICValue getValue() throws CDIException { + public ICDIValue getValue() throws CDIException { return null; } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICObject#getCDITarget() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDIObject#getCDITarget() */ - public ICTarget getCDITarget() { + public ICDITarget getCDITarget() { return null; } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICObject#getId() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDIObject#getId() */ public String getId() { return null; } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICObject#getParent() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDIObject#getParent() */ - public ICObject getParent() { + public ICDIObject getParent() { return null; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/ExpressionManager.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/ExpressionManager.java index af17ee52e5a..71e53a9743f 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/ExpressionManager.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/ExpressionManager.java @@ -6,9 +6,9 @@ package org.eclipse.cdt.debug.mi.core.cdi; import org.eclipse.cdt.debug.core.cdi.CDIException; -import org.eclipse.cdt.debug.core.cdi.ICExpressionManager; -import org.eclipse.cdt.debug.core.cdi.ICSession; -import org.eclipse.cdt.debug.core.cdi.model.ICExpression; +import org.eclipse.cdt.debug.core.cdi.ICDIExpressionManager; +import org.eclipse.cdt.debug.core.cdi.ICDISession; +import org.eclipse.cdt.debug.core.cdi.model.ICDIExpression; /** * @author alain @@ -18,43 +18,43 @@ import org.eclipse.cdt.debug.core.cdi.model.ICExpression; * To enable and disable the creation of type comments go to * Window>Preferences>Java>Code Generation. */ -public class ExpressionManager extends SessionObject implements ICExpressionManager { +public class ExpressionManager extends SessionObject implements ICDIExpressionManager { public ExpressionManager(CSession session) { super(session); } /** - * @see org.eclipse.cdt.debug.core.cdi.ICExpressionManager#addExpression(ICExpression) + * @see org.eclipse.cdt.debug.core.cdi.ICDIExpressionManager#addExpression(ICDIExpression) */ - public void addExpression(ICExpression expression) throws CDIException { + public void addExpression(ICDIExpression expression) throws CDIException { } /** - * @see org.eclipse.cdt.debug.core.cdi.ICExpressionManager#getExpression(String) + * @see org.eclipse.cdt.debug.core.cdi.ICDIExpressionManager#getExpression(String) */ - public ICExpression getExpression(String expressionId) + public ICDIExpression getExpression(String expressionId) throws CDIException { return null; } /** - * @see org.eclipse.cdt.debug.core.cdi.ICExpressionManager#getExpressions() + * @see org.eclipse.cdt.debug.core.cdi.ICDIExpressionManager#getExpressions() */ - public ICExpression[] getExpressions() throws CDIException { + public ICDIExpression[] getExpressions() throws CDIException { return null; } /** - * @see org.eclipse.cdt.debug.core.cdi.ICExpressionManager#removeExpression(ICExpression) + * @see org.eclipse.cdt.debug.core.cdi.ICDIExpressionManager#removeExpression(ICDIExpression) */ - public void removeExpression(ICExpression expression) throws CDIException { + public void removeExpression(ICDIExpression expression) throws CDIException { } /** - * @see org.eclipse.cdt.debug.core.cdi.ICExpressionManager#removeExpressions(ICExpression[]) + * @see org.eclipse.cdt.debug.core.cdi.ICDIExpressionManager#removeExpressions(ICDIExpression[]) */ - public void removeExpressions(ICExpression[] expressions) + public void removeExpressions(ICDIExpression[] expressions) throws CDIException { } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/Location.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/Location.java index 50d439e8c61..24e42fdf06b 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/Location.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/Location.java @@ -1,8 +1,8 @@ package org.eclipse.cdt.debug.mi.core.cdi; import org.eclipse.cdt.debug.core.cdi.CDIException; -import org.eclipse.cdt.debug.core.cdi.ICLocation; -import org.eclipse.cdt.debug.core.cdi.model.ICInstruction; +import org.eclipse.cdt.debug.core.cdi.ICDILocation; +import org.eclipse.cdt.debug.core.cdi.model.ICDIInstruction; /** * @author alain @@ -12,7 +12,7 @@ import org.eclipse.cdt.debug.core.cdi.model.ICInstruction; * To enable and disable the creation of type comments go to * Window>Preferences>Java>Code Generation. */ -public class Location implements ICLocation { +public class Location implements ICDILocation { long addr; String file = ""; @@ -27,42 +27,42 @@ public class Location implements ICLocation { } /** - * @see org.eclipse.cdt.debug.core.cdi.ICLocation#getAddress() + * @see org.eclipse.cdt.debug.core.cdi.ICDILocation#getAddress() */ public long getAddress() { return addr; } /** - * @see org.eclipse.cdt.debug.core.cdi.ICLocation#getFile() + * @see org.eclipse.cdt.debug.core.cdi.ICDILocation#getFile() */ public String getFile() { return file; } /** - * @see org.eclipse.cdt.debug.core.cdi.ICLocation#getFunction() + * @see org.eclipse.cdt.debug.core.cdi.ICDILocation#getFunction() */ public String getFunction() { return function; } /** - * @see org.eclipse.cdt.debug.core.cdi.ICLocation#getInstructions() + * @see org.eclipse.cdt.debug.core.cdi.ICDILocation#getInstructions() */ - public ICInstruction[] getInstructions() throws CDIException { - return new ICInstruction[0]; + public ICDIInstruction[] getInstructions() throws CDIException { + return new ICDIInstruction[0]; } /** - * @see org.eclipse.cdt.debug.core.cdi.ICLocation#getInstructions(int) + * @see org.eclipse.cdt.debug.core.cdi.ICDILocation#getInstructions(int) */ - public ICInstruction[] getInstructions(int maxCount) throws CDIException { - return new ICInstruction[0]; + public ICDIInstruction[] getInstructions(int maxCount) throws CDIException { + return new ICDIInstruction[0]; } /** - * @see org.eclipse.cdt.debug.core.cdi.ICLocation#getLineNumber() + * @see org.eclipse.cdt.debug.core.cdi.ICDILocation#getLineNumber() */ public int getLineNumber() { return line; diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/MemoryManager.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/MemoryManager.java index 830cd7676c6..e51ef42dda5 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/MemoryManager.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/MemoryManager.java @@ -6,9 +6,9 @@ package org.eclipse.cdt.debug.mi.core.cdi; import org.eclipse.cdt.debug.core.cdi.CDIException; -import org.eclipse.cdt.debug.core.cdi.ICMemoryManager; -import org.eclipse.cdt.debug.core.cdi.ICSession; -import org.eclipse.cdt.debug.core.cdi.model.ICMemoryBlock; +import org.eclipse.cdt.debug.core.cdi.ICDIMemoryManager; +import org.eclipse.cdt.debug.core.cdi.ICDISession; +import org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlock; /** * @author alain @@ -18,48 +18,48 @@ import org.eclipse.cdt.debug.core.cdi.model.ICMemoryBlock; * To enable and disable the creation of type comments go to * Window>Preferences>Java>Code Generation. */ -public class MemoryManager extends SessionObject implements ICMemoryManager { +public class MemoryManager extends SessionObject implements ICDIMemoryManager { public MemoryManager(CSession session) { super(session); } /** - * @see org.eclipse.cdt.debug.core.cdi.ICMemoryManager#addBlock(ICMemoryBlock) + * @see org.eclipse.cdt.debug.core.cdi.ICDIMemoryManager#addBlock(ICDIMemoryBlock) */ - public void addBlock(ICMemoryBlock memoryBlock) throws CDIException { + public void addBlock(ICDIMemoryBlock memoryBlock) throws CDIException { } /** - * @see org.eclipse.cdt.debug.core.cdi.ICMemoryManager#getBlock(String) + * @see org.eclipse.cdt.debug.core.cdi.ICDIMemoryManager#getBlock(String) */ - public ICMemoryBlock getBlock(String id) throws CDIException { + public ICDIMemoryBlock getBlock(String id) throws CDIException { return null; } /** - * @see org.eclipse.cdt.debug.core.cdi.ICMemoryManager#getBlocks() + * @see org.eclipse.cdt.debug.core.cdi.ICDIMemoryManager#getBlocks() */ - public ICMemoryBlock[] getBlocks() throws CDIException { + public ICDIMemoryBlock[] getBlocks() throws CDIException { return null; } /** - * @see org.eclipse.cdt.debug.core.cdi.ICMemoryManager#removeAllBlocks() + * @see org.eclipse.cdt.debug.core.cdi.ICDIMemoryManager#removeAllBlocks() */ public void removeAllBlocks() throws CDIException { } /** - * @see org.eclipse.cdt.debug.core.cdi.ICMemoryManager#removeBlock(ICMemoryBlock) + * @see org.eclipse.cdt.debug.core.cdi.ICDIMemoryManager#removeBlock(ICDIMemoryBlock) */ - public void removeBlock(ICMemoryBlock memoryBlock) { + public void removeBlock(ICDIMemoryBlock memoryBlock) { } /** - * @see org.eclipse.cdt.debug.core.cdi.ICMemoryManager#removeBlocks(ICMemoryBlock[]) + * @see org.eclipse.cdt.debug.core.cdi.ICDIMemoryManager#removeBlocks(ICDIMemoryBlock[]) */ - public void removeBlocks(ICMemoryBlock[] memoryBlocks) + public void removeBlocks(ICDIMemoryBlock[] memoryBlocks) throws CDIException { } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/RuntimeOptions.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/RuntimeOptions.java index de4c64249ab..d6e02e5249e 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/RuntimeOptions.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/RuntimeOptions.java @@ -2,7 +2,7 @@ package org.eclipse.cdt.debug.mi.core.cdi; import java.util.Properties; -import org.eclipse.cdt.debug.core.cdi.ICRuntimeOptions; +import org.eclipse.cdt.debug.core.cdi.ICDIRuntimeOptions; /** * @author alain @@ -12,22 +12,22 @@ import org.eclipse.cdt.debug.core.cdi.ICRuntimeOptions; * To enable and disable the creation of type comments go to * Window>Preferences>Java>Code Generation. */ -public class RuntimeOptions implements ICRuntimeOptions { +public class RuntimeOptions implements ICDIRuntimeOptions { /** - * @see org.eclipse.cdt.debug.core.cdi.ICRuntimeOptions#setArguments(String) + * @see org.eclipse.cdt.debug.core.cdi.ICDIRuntimeOptions#setArguments(String) */ public void setArguments(String args) { } /** - * @see org.eclipse.cdt.debug.core.cdi.ICRuntimeOptions#setEnvironment(Properties) + * @see org.eclipse.cdt.debug.core.cdi.ICDIRuntimeOptions#setEnvironment(Properties) */ public void setEnvironment(Properties props) { } /** - * @see org.eclipse.cdt.debug.core.cdi.ICRuntimeOptions#setWorkingDirectory(String) + * @see org.eclipse.cdt.debug.core.cdi.ICDIRuntimeOptions#setWorkingDirectory(String) */ public void setWorkingDirectory(String wd) { } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/SessionObject.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/SessionObject.java index b9b3e602104..ace322dcb58 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/SessionObject.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/SessionObject.java @@ -1,7 +1,7 @@ package org.eclipse.cdt.debug.mi.core.cdi; -import org.eclipse.cdt.debug.core.cdi.ICSession; -import org.eclipse.cdt.debug.core.cdi.ICSessionObject; +import org.eclipse.cdt.debug.core.cdi.ICDISession; +import org.eclipse.cdt.debug.core.cdi.ICDISessionObject; /** * @author alain @@ -11,7 +11,7 @@ import org.eclipse.cdt.debug.core.cdi.ICSessionObject; * To enable and disable the creation of type comments go to * Window>Preferences>Java>Code Generation. */ -public class SessionObject implements ICSessionObject { +public class SessionObject implements ICDISessionObject { private CSession session; @@ -20,9 +20,9 @@ public class SessionObject implements ICSessionObject { } /** - * @see org.eclipse.cdt.debug.core.cdi.ICSessionObject#getSession() + * @see org.eclipse.cdt.debug.core.cdi.ICDISessionObject#getSession() */ - public ICSession getSession() { + public ICDISession getSession() { return session; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/SignalManager.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/SignalManager.java index 8e7572383f0..c62f4977be5 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/SignalManager.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/SignalManager.java @@ -6,9 +6,9 @@ package org.eclipse.cdt.debug.mi.core.cdi; import org.eclipse.cdt.debug.core.cdi.CDIException; -import org.eclipse.cdt.debug.core.cdi.ICSession; -import org.eclipse.cdt.debug.core.cdi.ICSignal; -import org.eclipse.cdt.debug.core.cdi.ICSignalManager; +import org.eclipse.cdt.debug.core.cdi.ICDISession; +import org.eclipse.cdt.debug.core.cdi.ICDISignal; +import org.eclipse.cdt.debug.core.cdi.ICDISignalManager; /** * @author alain @@ -18,16 +18,16 @@ import org.eclipse.cdt.debug.core.cdi.ICSignalManager; * To enable and disable the creation of type comments go to * Window>Preferences>Java>Code Generation. */ -public class SignalManager extends SessionObject implements ICSignalManager { +public class SignalManager extends SessionObject implements ICDISignalManager { public SignalManager(CSession session) { super(session); } /** - * @see org.eclipse.cdt.debug.core.cdi.ICSignalManager#getSignals() + * @see org.eclipse.cdt.debug.core.cdi.ICDISignalManager#getSignals() */ - public ICSignal[] getSignals() throws CDIException { + public ICDISignal[] getSignals() throws CDIException { return null; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/SourceManager.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/SourceManager.java index ce35f55cb36..2e175b75dcb 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/SourceManager.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/SourceManager.java @@ -8,8 +8,8 @@ package org.eclipse.cdt.debug.mi.core.cdi; import java.io.File; import org.eclipse.cdt.debug.core.cdi.CDIException; -import org.eclipse.cdt.debug.core.cdi.ICSession; -import org.eclipse.cdt.debug.core.cdi.ICSourceManager; +import org.eclipse.cdt.debug.core.cdi.ICDISession; +import org.eclipse.cdt.debug.core.cdi.ICDISourceManager; /** * @author alain @@ -19,27 +19,27 @@ import org.eclipse.cdt.debug.core.cdi.ICSourceManager; * To enable and disable the creation of type comments go to * Window>Preferences>Java>Code Generation. */ -public class SourceManager extends SessionObject implements ICSourceManager { +public class SourceManager extends SessionObject implements ICDISourceManager { public SourceManager(CSession session) { super(session); } /** - * @see org.eclipse.cdt.debug.core.cdi.ICSourceManager#getDirectories() + * @see org.eclipse.cdt.debug.core.cdi.ICDISourceManager#getDirectories() */ public File[] getDirectories() throws CDIException { return null; } /** - * @see org.eclipse.cdt.debug.core.cdi.ICSourceManager#reset() + * @see org.eclipse.cdt.debug.core.cdi.ICDISourceManager#reset() */ public void reset() throws CDIException { } /** - * @see org.eclipse.cdt.debug.core.cdi.ICSourceManager#set(File[]) + * @see org.eclipse.cdt.debug.core.cdi.ICDISourceManager#set(File[]) */ public void set(File[] directories) throws CDIException { } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/StackFrame.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/StackFrame.java index c6cbf792be2..052dfea9275 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/StackFrame.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/StackFrame.java @@ -1,12 +1,12 @@ package org.eclipse.cdt.debug.mi.core.cdi; import org.eclipse.cdt.debug.core.cdi.CDIException; -import org.eclipse.cdt.debug.core.cdi.ICLocation; -import org.eclipse.cdt.debug.core.cdi.model.ICArgument; -import org.eclipse.cdt.debug.core.cdi.model.ICObject; -import org.eclipse.cdt.debug.core.cdi.model.ICStackFrame; -import org.eclipse.cdt.debug.core.cdi.model.ICTarget; -import org.eclipse.cdt.debug.core.cdi.model.ICVariable; +import org.eclipse.cdt.debug.core.cdi.ICDILocation; +import org.eclipse.cdt.debug.core.cdi.model.ICDIArgument; +import org.eclipse.cdt.debug.core.cdi.model.ICDIObject; +import org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame; +import org.eclipse.cdt.debug.core.cdi.model.ICDITarget; +import org.eclipse.cdt.debug.core.cdi.model.ICDIVariable; import org.eclipse.cdt.debug.mi.core.MIException; import org.eclipse.cdt.debug.mi.core.MISession; import org.eclipse.cdt.debug.mi.core.command.CommandFactory; @@ -23,7 +23,7 @@ import org.eclipse.cdt.debug.mi.core.output.MIStackListLocalsInfo; * To enable and disable the creation of type comments go to * Window>Preferences>Java>Code Generation. */ -public class StackFrame implements ICStackFrame { +public class StackFrame implements ICDIStackFrame { CSession session; MIFrame frame; @@ -34,11 +34,11 @@ public class StackFrame implements ICStackFrame { } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICStackFrame#getArguments() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame#getArguments() */ - public ICArgument[] getArguments() throws CDIException { + public ICDIArgument[] getArguments() throws CDIException { MIArg[] args = frame.getArgs(); - ICArgument[] cargs = new ICArgument[args.length]; + ICDIArgument[] cargs = new ICDIArgument[args.length]; for (int i = 0; i < cargs.length; i++) { cargs[i] = new Argument(args[i]); } @@ -46,11 +46,11 @@ public class StackFrame implements ICStackFrame { } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICStackFrame#getLocalVariables() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame#getLocalVariables() */ - public ICVariable[] getLocalVariables() throws CDIException { + public ICDIVariable[] getLocalVariables() throws CDIException { MIArg[] args = null; - ICVariable[] variables = null; + ICDIVariable[] variables = null; MISession mi = session.getMISession(); CommandFactory factory = mi.getCommandFactory(); MIStackListLocals locals = factory.createMIStackListLocals(true); @@ -66,42 +66,42 @@ public class StackFrame implements ICStackFrame { //throw new CDIException(e); } if (args != null) { - variables = new ICVariable[args.length]; + variables = new ICDIVariable[args.length]; for (int i = 0; i < variables.length; i++) { variables[i] = new Variable(args[i]); } } else { - variables = new ICVariable[0]; + variables = new ICDIVariable[0]; } return variables; } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICStackFrame#getLocation() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame#getLocation() */ - public ICLocation getLocation() { + public ICDILocation getLocation() { return new Location(frame.getFile(), frame.getFunction(), frame.getLine(), frame.getAddress()); } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICObject#getCDITarget() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDIObject#getCDITarget() */ - public ICTarget getCDITarget() { + public ICDITarget getCDITarget() { return session.getCTarget(); } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICObject#getId() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDIObject#getId() */ public String getId() { return null; } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICObject#getParent() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDIObject#getParent() */ - public ICObject getParent() { + public ICDIObject getParent() { return null; } } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/SuspendedEvent.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/SuspendedEvent.java index 48af4e6c57f..104e22622f6 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/SuspendedEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/SuspendedEvent.java @@ -1,14 +1,14 @@ package org.eclipse.cdt.debug.mi.core.cdi; -import org.eclipse.cdt.debug.core.cdi.ICLocation; -import org.eclipse.cdt.debug.core.cdi.ICSessionObject; -import org.eclipse.cdt.debug.core.cdi.event.ICEvent; -import org.eclipse.cdt.debug.core.cdi.event.ICSuspendedEvent; -import org.eclipse.cdt.debug.core.cdi.model.ICArgument; -import org.eclipse.cdt.debug.core.cdi.model.ICObject; -import org.eclipse.cdt.debug.core.cdi.model.ICStackFrame; -import org.eclipse.cdt.debug.core.cdi.model.ICTarget; -import org.eclipse.cdt.debug.core.cdi.model.ICVariable; +import org.eclipse.cdt.debug.core.cdi.ICDILocation; +import org.eclipse.cdt.debug.core.cdi.ICDISessionObject; +import org.eclipse.cdt.debug.core.cdi.event.ICDIEvent; +import org.eclipse.cdt.debug.core.cdi.event.ICDISuspendedEvent; +import org.eclipse.cdt.debug.core.cdi.model.ICDIArgument; +import org.eclipse.cdt.debug.core.cdi.model.ICDIObject; +import org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame; +import org.eclipse.cdt.debug.core.cdi.model.ICDITarget; +import org.eclipse.cdt.debug.core.cdi.model.ICDIVariable; import org.eclipse.cdt.debug.mi.core.event.MIBreakpointEvent; import org.eclipse.cdt.debug.mi.core.event.MIEvent; import org.eclipse.cdt.debug.mi.core.event.MIExitEvent; @@ -26,7 +26,7 @@ import org.eclipse.cdt.debug.mi.core.event.MIWatchpointEvent; * To enable and disable the creation of type comments go to * Window>Preferences>Java>Code Generation. */ -public class SuspendedEvent implements ICSuspendedEvent { +public class SuspendedEvent implements ICDISuspendedEvent { MIBreakpointEvent event; CSession session; @@ -36,17 +36,17 @@ public class SuspendedEvent implements ICSuspendedEvent { event = e; } - public ICSessionObject getReason() { + public ICDISessionObject getReason() { return new SessionObject(session); } - public ICStackFrame getStackFrame() { + public ICDIStackFrame getStackFrame() { return new StackFrame(session, event.getMIFrame()); } /** - * @see org.eclipse.cdt.debug.core.cdi.event.ICEvent#getSource() + * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEvent#getSource() */ - public ICObject getSource() { + public ICDIObject getSource() { return null; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/Value.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/Value.java index e4433ab4bd6..41d489fecf8 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/Value.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/Value.java @@ -1,10 +1,10 @@ package org.eclipse.cdt.debug.mi.core.cdi; import org.eclipse.cdt.debug.core.cdi.CDIException; -import org.eclipse.cdt.debug.core.cdi.model.ICObject; -import org.eclipse.cdt.debug.core.cdi.model.ICTarget; -import org.eclipse.cdt.debug.core.cdi.model.ICValue; -import org.eclipse.cdt.debug.core.cdi.model.ICVariable; +import org.eclipse.cdt.debug.core.cdi.model.ICDIObject; +import org.eclipse.cdt.debug.core.cdi.model.ICDITarget; +import org.eclipse.cdt.debug.core.cdi.model.ICDIValue; +import org.eclipse.cdt.debug.core.cdi.model.ICDIVariable; /** * @author alain @@ -14,7 +14,7 @@ import org.eclipse.cdt.debug.core.cdi.model.ICVariable; * To enable and disable the creation of type comments go to * Window>Preferences>Java>Code Generation. */ -public class Value implements ICValue { +public class Value implements ICDIValue { String val = ""; @@ -23,44 +23,44 @@ public class Value implements ICValue { } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICValue#getTypeName() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDIValue#getTypeName() */ public String getTypeName() throws CDIException { return ""; } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICValue#getValueString() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDIValue#getValueString() */ public String getValueString() throws CDIException { return val; } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICValue#getVariables() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDIValue#getVariables() */ - public ICVariable[] getVariables() throws CDIException { - return new ICVariable[0]; + public ICDIVariable[] getVariables() throws CDIException { + return new ICDIVariable[0]; } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICObject#getCDITarget() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDIObject#getCDITarget() */ - public ICTarget getCDITarget() { + public ICDITarget getCDITarget() { return null; } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICObject#getId() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDIObject#getId() */ public String getId() { return null; } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICObject#getParent() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDIObject#getParent() */ - public ICObject getParent() { + public ICDIObject getParent() { return null; } } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/Variable.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/Variable.java index ad4bea587a3..acf8eef2946 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/Variable.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/Variable.java @@ -1,10 +1,10 @@ package org.eclipse.cdt.debug.mi.core.cdi; import org.eclipse.cdt.debug.core.cdi.CDIException; -import org.eclipse.cdt.debug.core.cdi.model.ICObject; -import org.eclipse.cdt.debug.core.cdi.model.ICTarget; -import org.eclipse.cdt.debug.core.cdi.model.ICValue; -import org.eclipse.cdt.debug.core.cdi.model.ICVariable; +import org.eclipse.cdt.debug.core.cdi.model.ICDIObject; +import org.eclipse.cdt.debug.core.cdi.model.ICDITarget; +import org.eclipse.cdt.debug.core.cdi.model.ICDIValue; +import org.eclipse.cdt.debug.core.cdi.model.ICDIVariable; import org.eclipse.cdt.debug.mi.core.output.MIArg; /** @@ -15,7 +15,7 @@ import org.eclipse.cdt.debug.mi.core.output.MIArg; * To enable and disable the creation of type comments go to * Window>Preferences>Java>Code Generation. */ -public class Variable implements ICVariable { +public class Variable implements ICDIVariable { MIArg arg; @@ -23,63 +23,63 @@ public class Variable implements ICVariable { arg = a; } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICVariable#getName() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariable#getName() */ public String getName() throws CDIException { return arg.getName(); } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICVariable#getTypeName() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariable#getTypeName() */ public String getTypeName() throws CDIException { return null; } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICVariable#getValue() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariable#getValue() */ - public ICValue getValue() throws CDIException { + public ICDIValue getValue() throws CDIException { return null; } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICVariable#hasValueChanged() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariable#hasValueChanged() */ public boolean hasValueChanged() throws CDIException { return false; } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICVariable#setValue(ICValue) + * @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariable#setValue(ICDIValue) */ - public void setValue(ICValue value) throws CDIException { + public void setValue(ICDIValue value) throws CDIException { } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICVariable#setValue(String) + * @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariable#setValue(String) */ public void setValue(String expression) throws CDIException { } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICObject#getCDITarget() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDIObject#getCDITarget() */ - public ICTarget getCDITarget() { + public ICDITarget getCDITarget() { return null; } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICObject#getId() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDIObject#getId() */ public String getId() { return null; } /** - * @see org.eclipse.cdt.debug.core.cdi.model.ICObject#getParent() + * @see org.eclipse.cdt.debug.core.cdi.model.ICDIObject#getParent() */ - public ICObject getParent() { + public ICDIObject getParent() { return null; }