From 5105e236734b133df03d68e8db658eea919ffada Mon Sep 17 00:00:00 2001 From: Mikhail Khodjaiants Date: Mon, 2 Dec 2002 23:22:22 +0000 Subject: [PATCH] Refactoring org.eclipse.cdt.debug.core: added 'org.eclipse.cdt.debug.core.model' package. --- debug/org.eclipse.cdt.debug.core/ChangeLog | 26 ++++++++ .../eclipse/cdt/debug/core/CDebugModel.java | 5 ++ .../cdt/debug/core/ICMemoryManager.java | 1 + .../debug/core/IFormattedMemoryRetrieval.java | 32 ---------- .../core/{ => model}/ICAddressBreakpoint.java | 2 +- .../debug/core/{ => model}/ICBreakpoint.java | 2 +- .../cdt/debug/core/model/ICDebugTarget.java | 25 ++++++++ .../core/{ => model}/ICDebugTargetType.java | 2 +- .../{ => model}/ICExpressionEvaluator.java | 2 +- .../{ => model}/ICFunctionBreakpoint.java | 2 +- .../core/{ => model}/ICLineBreakpoint.java | 2 +- .../cdt/debug/core/{ => model}/ICValue.java | 2 +- .../debug/core/{ => model}/ICWatchpoint.java | 2 +- .../{ => model}/IDebuggerProcessSupport.java | 2 +- .../core/{ => model}/IDummyStackFrame.java | 2 +- .../debug/core/{ => model}/IExecFileInfo.java | 2 +- .../{ => model}/IFormattedMemoryBlock.java | 2 +- .../{ => model}/IFormattedMemoryBlockRow.java | 2 +- .../core/{ => model}/IGlobalVariable.java | 2 +- .../core/{ => model}/IInstructionStep.java | 2 +- .../cdt/debug/core/{ => model}/IRestart.java | 6 +- .../debug/core/{ => model}/IRunToLine.java | 2 +- .../core/{ => model}/IStackFrameInfo.java | 2 +- .../cdt/debug/core/{ => model}/IState.java | 2 +- .../core/{ => model}/ISwitchToFrame.java | 2 +- .../core/{ => model}/ISwitchToThread.java | 2 +- .../core/sourcelookup/ICSourceLocator.java | 2 +- .../IDisassemblyStorage.java | 2 +- .../debug/internal/core/CMemoryManager.java | 2 +- .../internal/core/DisassemblyStorage.java | 2 +- .../core/breakpoints/CAddressBreakpoint.java | 2 +- .../core/breakpoints/CBreakpoint.java | 2 +- .../core/breakpoints/CFunctionBreakpoint.java | 2 +- .../core/breakpoints/CLineBreakpoint.java | 2 +- .../core/breakpoints/CWatchpoint.java | 2 +- .../core/model/CArrayPartitionValue.java | 2 +- .../internal/core/model/CDebugElement.java | 10 +++ .../internal/core/model/CDebugTarget.java | 63 ++++--------------- .../internal/core/model/CDummyStackFrame.java | 2 +- .../core/model/CFormattedMemoryBlock.java | 6 +- .../core/model/CModificationVariable.java | 2 +- .../internal/core/model/CStackFrame.java | 4 +- .../debug/internal/core/model/CThread.java | 12 ++-- .../cdt/debug/internal/core/model/CValue.java | 2 +- .../internal/core/model/CValueFactory.java | 2 +- .../debug/internal/core/model/CVariable.java | 2 +- .../core/sourcelookup/CSourceLocator.java | 2 +- .../core/sourcelookup/CSourceManager.java | 2 +- .../core/sourcelookup/DisassemblyManager.java | 2 +- debug/org.eclipse.cdt.debug.ui/ChangeLog | 3 + .../ui/CDTDebugModelPresentation.java | 22 +++---- .../AbstractBreakpointRulerAction.java | 2 +- .../actions/AddExpressionActionDelegate.java | 2 +- .../ui/actions/AddGlobalsActionDelegate.java | 4 +- .../ui/actions/CBreakpointPreferencePage.java | 4 +- .../actions/CBreakpointPropertiesAction.java | 2 +- .../actions/CBreakpointPropertiesDialog.java | 2 +- .../CBreakpointPropertiesRulerAction.java | 2 +- .../DebuggerConsoleActionDelegate.java | 2 +- .../ManageBreakpointActionDelegate.java | 2 +- .../ui/actions/MemoryFormatAction.java | 2 +- .../internal/ui/actions/MemorySizeAction.java | 2 +- .../ui/actions/RestartActionDelegate.java | 2 +- .../ui/actions/RunToLineActionDelegate.java | 2 +- .../ui/actions/RunToLineRulerAction.java | 2 +- .../internal/ui/editors/DebugTextHover.java | 2 +- .../ui/views/memory/MemoryControlArea.java | 2 +- .../ui/views/memory/MemoryPresentation.java | 4 +- .../internal/ui/views/memory/MemoryView.java | 2 +- .../views/memory/MemoryViewEventHandler.java | 2 +- .../ui/views/memory/MemoryViewer.java | 2 +- .../eclipse/cdt/debug/ui/CDebugUIPlugin.java | 6 +- .../cdt/debug/ui/CUISourceLocator.java | 2 +- 73 files changed, 173 insertions(+), 172 deletions(-) delete mode 100644 debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IFormattedMemoryRetrieval.java rename debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/{ => model}/ICAddressBreakpoint.java (95%) rename debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/{ => model}/ICBreakpoint.java (98%) create mode 100644 debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICDebugTarget.java rename debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/{ => model}/ICDebugTargetType.java (91%) rename debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/{ => model}/ICExpressionEvaluator.java (94%) rename debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/{ => model}/ICFunctionBreakpoint.java (95%) rename debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/{ => model}/ICLineBreakpoint.java (88%) rename debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/{ => model}/ICValue.java (95%) rename debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/{ => model}/ICWatchpoint.java (97%) rename debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/{ => model}/IDebuggerProcessSupport.java (89%) rename debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/{ => model}/IDummyStackFrame.java (81%) rename debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/{ => model}/IExecFileInfo.java (87%) rename debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/{ => model}/IFormattedMemoryBlock.java (98%) rename debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/{ => model}/IFormattedMemoryBlockRow.java (93%) rename debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/{ => model}/IGlobalVariable.java (85%) rename debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/{ => model}/IInstructionStep.java (96%) rename debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/{ => model}/IRestart.java (93%) rename debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/{ => model}/IRunToLine.java (94%) rename debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/{ => model}/IStackFrameInfo.java (96%) rename debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/{ => model}/IState.java (95%) rename debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/{ => model}/ISwitchToFrame.java (89%) rename debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/{ => model}/ISwitchToThread.java (90%) rename debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/{ => sourcelookup}/IDisassemblyStorage.java (94%) diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog index 7fb93075d78..d4a37278b3f 100644 --- a/debug/org.eclipse.cdt.debug.core/ChangeLog +++ b/debug/org.eclipse.cdt.debug.core/ChangeLog @@ -1,3 +1,29 @@ +2002-12-02 Mikhail Khodjaiants + Refactoring - files moved from org.eclipse.cdt.debug.core to the new package: org.eclipse.cdt.debug.core.model: + * ICBreakpoint.java + * ICDebugTarget.java + * ICExpressionEvaluator.java + * ICFunctionBreakpoint.java + * ICLineBreakpoint.java + * ICValue.java + * ICWatchpoint.java + * IDebuggerProcessSupport.java + * IDummyStackFrame.java + * IExecFileInfo.java + * IFormattedMemoryBlock.java + * IFormattedMemoryBlockRow.java + * IGlobalVariable.java + * IInstructionStep.java + * IRestart.java + * IRunToLine.java + * IStackFrameInfo.java + * IState.java + * ISwitchToFrame.java + * ISwitchToThread.java + * ICDebugTargetType.java: new interface + * IFormattedMemoryRetrieval: removed + + 2002-12-02 Mikhail Khodjaiants Check if the underlying IFile exists when retrieving the path of global variable. * CDebugTarget.java 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 c1aeed62643..aa2fa3ee447 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 @@ -18,6 +18,11 @@ import org.eclipse.cdt.debug.core.cdi.model.ICDIExpression; 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.ICDITarget; +import org.eclipse.cdt.debug.core.model.ICBreakpoint; +import org.eclipse.cdt.debug.core.model.ICDebugTargetType; +import org.eclipse.cdt.debug.core.model.ICLineBreakpoint; +import org.eclipse.cdt.debug.core.model.ICWatchpoint; +import org.eclipse.cdt.debug.core.model.IFormattedMemoryBlock; import org.eclipse.cdt.debug.internal.core.CDebugUtils; import org.eclipse.cdt.debug.internal.core.ICDebugInternalConstants; import org.eclipse.cdt.debug.internal.core.breakpoints.CLineBreakpoint; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICMemoryManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICMemoryManager.java index 0168192fa7c..ee2d854e696 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICMemoryManager.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICMemoryManager.java @@ -5,6 +5,7 @@ */ package org.eclipse.cdt.debug.core; +import org.eclipse.cdt.debug.core.model.IFormattedMemoryBlock; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.debug.core.DebugException; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IFormattedMemoryRetrieval.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IFormattedMemoryRetrieval.java deleted file mode 100644 index 0742ba784fa..00000000000 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IFormattedMemoryRetrieval.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - *(c) Copyright QNX Software Systems Ltd. 2002. - * All Rights Reserved. - * - */ -package org.eclipse.cdt.debug.core; - -import org.eclipse.debug.core.DebugException; - -/** - * - * Supports the retrieval of formatted blocks of memory. - * - * @since Jul 31, 2002 - */ -public interface IFormattedMemoryRetrieval -{ - int[] getSupportedFormats() throws DebugException; - - IFormattedMemoryBlock getFormattedMemoryBlock( long startAddress, - int format, - int wordSize, - int numberOfRows, - int numberOfColumns ) throws DebugException; - - IFormattedMemoryBlock getFormattedMemoryBlock( long startAddress, - int format, - int wordSize, - int numberOfRows, - int numberOfColumns, - char paddingChar ) throws DebugException; -} diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICAddressBreakpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICAddressBreakpoint.java similarity index 95% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICAddressBreakpoint.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICAddressBreakpoint.java index 45aecd34ef7..129e943ddf6 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICAddressBreakpoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICAddressBreakpoint.java @@ -3,7 +3,7 @@ * All Rights Reserved. * */ -package org.eclipse.cdt.debug.core; +package org.eclipse.cdt.debug.core.model; import org.eclipse.core.runtime.CoreException; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICBreakpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICBreakpoint.java similarity index 98% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICBreakpoint.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICBreakpoint.java index aab54fcbc03..408dad8ad92 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICBreakpoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICBreakpoint.java @@ -4,7 +4,7 @@ * */ -package org.eclipse.cdt.debug.core; +package org.eclipse.cdt.debug.core.model; import org.eclipse.core.runtime.CoreException; import org.eclipse.debug.core.model.IBreakpoint; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICDebugTarget.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICDebugTarget.java new file mode 100644 index 00000000000..6321873f8cd --- /dev/null +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICDebugTarget.java @@ -0,0 +1,25 @@ +/* + *(c) Copyright QNX Software Systems Ltd. 2002. + * All Rights Reserved. + * + */ +package org.eclipse.cdt.debug.core.model; + +import org.eclipse.debug.core.model.IDebugTarget; + +/** + * A C/C++ specific extension of IDebugTarget. + * + * @since: Dec 2, 2002 + */ +public interface ICDebugTarget extends IDebugTarget, + ICDebugTargetType, + ICExpressionEvaluator, + IDebuggerProcessSupport, + IExecFileInfo, + IRestart, + IRunToLine, + IState, + ISwitchToThread +{ +} diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDebugTargetType.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICDebugTargetType.java similarity index 91% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDebugTargetType.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICDebugTargetType.java index e07add589ac..46cbf1d4dfd 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDebugTargetType.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICDebugTargetType.java @@ -1,4 +1,4 @@ -package org.eclipse.cdt.debug.core; +package org.eclipse.cdt.debug.core.model; /** * diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICExpressionEvaluator.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICExpressionEvaluator.java similarity index 94% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICExpressionEvaluator.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICExpressionEvaluator.java index dcf06b36dc9..bfbc6c90ca0 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICExpressionEvaluator.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICExpressionEvaluator.java @@ -3,7 +3,7 @@ * All Rights Reserved. * */ -package org.eclipse.cdt.debug.core; +package org.eclipse.cdt.debug.core.model; import org.eclipse.debug.core.DebugException; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICFunctionBreakpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICFunctionBreakpoint.java similarity index 95% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICFunctionBreakpoint.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICFunctionBreakpoint.java index fd2e6bdf2e2..b5ccece2264 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICFunctionBreakpoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICFunctionBreakpoint.java @@ -3,7 +3,7 @@ * All Rights Reserved. * */ -package org.eclipse.cdt.debug.core; +package org.eclipse.cdt.debug.core.model; import org.eclipse.core.runtime.CoreException; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICLineBreakpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICLineBreakpoint.java similarity index 88% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICLineBreakpoint.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICLineBreakpoint.java index 1efa30a9b3e..c7dfa742d45 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICLineBreakpoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICLineBreakpoint.java @@ -4,7 +4,7 @@ * */ -package org.eclipse.cdt.debug.core; +package org.eclipse.cdt.debug.core.model; import org.eclipse.debug.core.model.ILineBreakpoint; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICValue.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICValue.java similarity index 95% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICValue.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICValue.java index 28f47453c7a..0e7c43689c0 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICValue.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICValue.java @@ -4,7 +4,7 @@ * */ -package org.eclipse.cdt.debug.core; +package org.eclipse.cdt.debug.core.model; import org.eclipse.cdt.debug.core.cdi.model.ICDIValue; import org.eclipse.debug.core.model.IValue; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICWatchpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICWatchpoint.java similarity index 97% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICWatchpoint.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICWatchpoint.java index c255036bfb5..f517cb02411 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICWatchpoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICWatchpoint.java @@ -3,7 +3,7 @@ * All Rights Reserved. * */ -package org.eclipse.cdt.debug.core; +package org.eclipse.cdt.debug.core.model; import org.eclipse.core.runtime.CoreException; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IDebuggerProcessSupport.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IDebuggerProcessSupport.java similarity index 89% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IDebuggerProcessSupport.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IDebuggerProcessSupport.java index 6c52a08dfe3..ebd4f02e005 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IDebuggerProcessSupport.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IDebuggerProcessSupport.java @@ -3,7 +3,7 @@ * All Rights Reserved. * */ -package org.eclipse.cdt.debug.core; +package org.eclipse.cdt.debug.core.model; /** * Provides the functionality to support debugger console. diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IDummyStackFrame.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IDummyStackFrame.java similarity index 81% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IDummyStackFrame.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IDummyStackFrame.java index 822d0d91d8c..815909d7e5f 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IDummyStackFrame.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IDummyStackFrame.java @@ -3,7 +3,7 @@ * All Rights Reserved. * */ -package org.eclipse.cdt.debug.core; +package org.eclipse.cdt.debug.core.model; /** * Enter type comment. diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IExecFileInfo.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IExecFileInfo.java similarity index 87% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IExecFileInfo.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IExecFileInfo.java index a641ad65bd4..4248496ad50 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IExecFileInfo.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IExecFileInfo.java @@ -4,7 +4,7 @@ * */ -package org.eclipse.cdt.debug.core; +package org.eclipse.cdt.debug.core.model; /** * Provides access to executable file information. diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IFormattedMemoryBlock.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IFormattedMemoryBlock.java similarity index 98% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IFormattedMemoryBlock.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IFormattedMemoryBlock.java index 1bd94c257f3..67ec19da326 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IFormattedMemoryBlock.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IFormattedMemoryBlock.java @@ -3,7 +3,7 @@ * All Rights Reserved. * */ -package org.eclipse.cdt.debug.core; +package org.eclipse.cdt.debug.core.model; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.model.IMemoryBlock; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IFormattedMemoryBlockRow.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IFormattedMemoryBlockRow.java similarity index 93% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IFormattedMemoryBlockRow.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IFormattedMemoryBlockRow.java index 249869a9f4d..697c233be4d 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IFormattedMemoryBlockRow.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IFormattedMemoryBlockRow.java @@ -4,7 +4,7 @@ * */ -package org.eclipse.cdt.debug.core; +package org.eclipse.cdt.debug.core.model; /** * diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IGlobalVariable.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IGlobalVariable.java similarity index 85% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IGlobalVariable.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IGlobalVariable.java index 7f6aa84a90a..1b488a9a27f 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IGlobalVariable.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IGlobalVariable.java @@ -3,7 +3,7 @@ * All Rights Reserved. * */ -package org.eclipse.cdt.debug.core; +package org.eclipse.cdt.debug.core.model; import org.eclipse.core.runtime.IPath; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IInstructionStep.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IInstructionStep.java similarity index 96% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IInstructionStep.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IInstructionStep.java index 08f8061386f..7011dc47c14 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IInstructionStep.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IInstructionStep.java @@ -4,7 +4,7 @@ * */ -package org.eclipse.cdt.debug.core; +package org.eclipse.cdt.debug.core.model; import org.eclipse.debug.core.DebugException; /** diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IRestart.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IRestart.java similarity index 93% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IRestart.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IRestart.java index d6e163fa2d7..8f77cc1a1e4 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IRestart.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IRestart.java @@ -4,9 +4,9 @@ * */ -package org.eclipse.cdt.debug.core; +package org.eclipse.cdt.debug.core.model; -import org.eclipse.debug.core.DebugException; +import org.eclipse.debug.core.DebugException; /** * Provides the ability to restart a debug target. * @@ -27,4 +27,4 @@ public interface IRestart */ public void restart() throws DebugException; } - + diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IRunToLine.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IRunToLine.java similarity index 94% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IRunToLine.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IRunToLine.java index 4dfb32d4f22..3201f3c4d51 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IRunToLine.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IRunToLine.java @@ -3,7 +3,7 @@ * All Rights Reserved. * */ -package org.eclipse.cdt.debug.core; +package org.eclipse.cdt.debug.core.model; import org.eclipse.core.resources.IResource; import org.eclipse.debug.core.DebugException; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IStackFrameInfo.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IStackFrameInfo.java similarity index 96% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IStackFrameInfo.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IStackFrameInfo.java index 65958648035..b3b6c45e044 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IStackFrameInfo.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IStackFrameInfo.java @@ -4,7 +4,7 @@ * */ -package org.eclipse.cdt.debug.core; +package org.eclipse.cdt.debug.core.model; import org.eclipse.debug.core.model.IVariable; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IState.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IState.java similarity index 95% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IState.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IState.java index c65541bc91b..42c237c0433 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IState.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IState.java @@ -4,7 +4,7 @@ * */ -package org.eclipse.cdt.debug.core; +package org.eclipse.cdt.debug.core.model; /** * diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ISwitchToFrame.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ISwitchToFrame.java similarity index 89% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ISwitchToFrame.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ISwitchToFrame.java index 536b71fe263..81b7d1cd19b 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ISwitchToFrame.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ISwitchToFrame.java @@ -3,7 +3,7 @@ * All Rights Reserved. * */ -package org.eclipse.cdt.debug.core; +package org.eclipse.cdt.debug.core.model; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.model.IStackFrame; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ISwitchToThread.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ISwitchToThread.java similarity index 90% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ISwitchToThread.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ISwitchToThread.java index 6d069cbe245..4e895c71eaa 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ISwitchToThread.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ISwitchToThread.java @@ -3,7 +3,7 @@ * All Rights Reserved. * */ -package org.eclipse.cdt.debug.core; +package org.eclipse.cdt.debug.core.model; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.model.IThread; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/ICSourceLocator.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/ICSourceLocator.java index 72036a50f0d..671735843f9 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/ICSourceLocator.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/ICSourceLocator.java @@ -5,7 +5,7 @@ */ package org.eclipse.cdt.debug.core.sourcelookup; -import org.eclipse.cdt.debug.core.IStackFrameInfo; +import org.eclipse.cdt.debug.core.model.IStackFrameInfo; import org.eclipse.core.resources.IResource; import org.eclipse.debug.core.model.ISourceLocator; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IDisassemblyStorage.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/IDisassemblyStorage.java similarity index 94% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IDisassemblyStorage.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/IDisassemblyStorage.java index 3f814faa79e..388ad1229ce 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IDisassemblyStorage.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/IDisassemblyStorage.java @@ -4,7 +4,7 @@ * */ -package org.eclipse.cdt.debug.core; +package org.eclipse.cdt.debug.core.sourcelookup; import org.eclipse.core.resources.IStorage; import org.eclipse.debug.core.model.IDebugTarget; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CMemoryManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CMemoryManager.java index f9b17519398..e443eeed12b 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CMemoryManager.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CMemoryManager.java @@ -8,7 +8,7 @@ package org.eclipse.cdt.debug.internal.core; import java.util.Arrays; import org.eclipse.cdt.debug.core.ICMemoryManager; -import org.eclipse.cdt.debug.core.IFormattedMemoryBlock; +import org.eclipse.cdt.debug.core.model.IFormattedMemoryBlock; import org.eclipse.cdt.debug.internal.core.model.CDebugTarget; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.model.IDebugTarget; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/DisassemblyStorage.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/DisassemblyStorage.java index 18145d8dfed..11f2b0af35d 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/DisassemblyStorage.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/DisassemblyStorage.java @@ -10,8 +10,8 @@ import java.io.ByteArrayInputStream; import java.io.InputStream; import java.util.Arrays; -import org.eclipse.cdt.debug.core.IDisassemblyStorage; import org.eclipse.cdt.debug.core.cdi.model.ICDIInstruction; +import org.eclipse.cdt.debug.core.sourcelookup.IDisassemblyStorage; import org.eclipse.core.resources.IStorage; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressBreakpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressBreakpoint.java index 449713b46bd..ae94648639e 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressBreakpoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressBreakpoint.java @@ -7,7 +7,7 @@ package org.eclipse.cdt.debug.internal.core.breakpoints; import java.util.Map; -import org.eclipse.cdt.debug.core.ICAddressBreakpoint; +import org.eclipse.cdt.debug.core.model.ICAddressBreakpoint; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CBreakpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CBreakpoint.java index 6024397c42d..db4a50229f1 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CBreakpoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CBreakpoint.java @@ -9,7 +9,7 @@ package org.eclipse.cdt.debug.internal.core.breakpoints; import java.util.Map; import org.eclipse.cdt.debug.core.CDebugModel; -import org.eclipse.cdt.debug.core.ICBreakpoint; +import org.eclipse.cdt.debug.core.model.ICBreakpoint; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IWorkspaceRunnable; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionBreakpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionBreakpoint.java index a8801764b16..09e2f170138 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionBreakpoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionBreakpoint.java @@ -7,7 +7,7 @@ package org.eclipse.cdt.debug.internal.core.breakpoints; import java.util.Map; -import org.eclipse.cdt.debug.core.ICFunctionBreakpoint; +import org.eclipse.cdt.debug.core.model.ICFunctionBreakpoint; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineBreakpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineBreakpoint.java index d403239d03d..6404205b9ba 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineBreakpoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineBreakpoint.java @@ -7,7 +7,7 @@ package org.eclipse.cdt.debug.internal.core.breakpoints; import java.util.Map; -import org.eclipse.cdt.debug.core.ICLineBreakpoint; +import org.eclipse.cdt.debug.core.model.ICLineBreakpoint; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CWatchpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CWatchpoint.java index 42b06375e85..effcaed6796 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CWatchpoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CWatchpoint.java @@ -7,7 +7,7 @@ package org.eclipse.cdt.debug.internal.core.breakpoints; import java.util.Map; -import org.eclipse.cdt.debug.core.ICWatchpoint; +import org.eclipse.cdt.debug.core.model.ICWatchpoint; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.debug.core.DebugException; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CArrayPartitionValue.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CArrayPartitionValue.java index 4c0716bf688..7df61cf1ea2 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CArrayPartitionValue.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CArrayPartitionValue.java @@ -10,9 +10,9 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.eclipse.cdt.debug.core.ICValue; import org.eclipse.cdt.debug.core.cdi.model.ICDIValue; import org.eclipse.cdt.debug.core.cdi.model.ICDIVariable; +import org.eclipse.cdt.debug.core.model.ICValue; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.model.IVariable; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugElement.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugElement.java index 4354526a063..f9b96dba2ef 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugElement.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugElement.java @@ -274,4 +274,14 @@ public class CDebugElement extends PlatformObject null ); CDebugUtils.info( newStatus, getDebugTarget() ); } + + /* (non-Javadoc) + * @see org.eclipse.core.runtime.IAdaptable#getAdapter(Class) + */ + public Object getAdapter( Class adapter ) + { + if ( adapter.equals( ICDISession.class ) ) + return getCDISession(); + return super.getAdapter(adapter); + } } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java index 9829920dd46..f600e40fadc 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java @@ -17,21 +17,7 @@ import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICFile; import org.eclipse.cdt.debug.core.CDebugCorePlugin; import org.eclipse.cdt.debug.core.CDebugModel; -import org.eclipse.cdt.debug.core.ICBreakpoint; -import org.eclipse.cdt.debug.core.ICDebugTargetType; -import org.eclipse.cdt.debug.core.ICExpressionEvaluator; -import org.eclipse.cdt.debug.core.ICLineBreakpoint; import org.eclipse.cdt.debug.core.ICMemoryManager; -import org.eclipse.cdt.debug.core.ICWatchpoint; -import org.eclipse.cdt.debug.core.IDebuggerProcessSupport; -import org.eclipse.cdt.debug.core.IExecFileInfo; -import org.eclipse.cdt.debug.core.IFormattedMemoryBlock; -import org.eclipse.cdt.debug.core.IFormattedMemoryRetrieval; -import org.eclipse.cdt.debug.core.IGlobalVariable; -import org.eclipse.cdt.debug.core.IRestart; -import org.eclipse.cdt.debug.core.IRunToLine; -import org.eclipse.cdt.debug.core.IState; -import org.eclipse.cdt.debug.core.ISwitchToThread; import org.eclipse.cdt.debug.core.cdi.CDIException; import org.eclipse.cdt.debug.core.cdi.ICDIBreakpointHit; import org.eclipse.cdt.debug.core.cdi.ICDIBreakpointManager; @@ -62,6 +48,17 @@ 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.cdt.debug.core.cdi.model.ICDIWatchpoint; +import org.eclipse.cdt.debug.core.model.ICBreakpoint; +import org.eclipse.cdt.debug.core.model.ICDebugTarget; +import org.eclipse.cdt.debug.core.model.ICDebugTargetType; +import org.eclipse.cdt.debug.core.model.ICExpressionEvaluator; +import org.eclipse.cdt.debug.core.model.ICLineBreakpoint; +import org.eclipse.cdt.debug.core.model.ICWatchpoint; +import org.eclipse.cdt.debug.core.model.IDebuggerProcessSupport; +import org.eclipse.cdt.debug.core.model.IExecFileInfo; +import org.eclipse.cdt.debug.core.model.IGlobalVariable; +import org.eclipse.cdt.debug.core.model.IRunToLine; +import org.eclipse.cdt.debug.core.model.IState; import org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocation; import org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator; import org.eclipse.cdt.debug.core.sourcelookup.ISourceMode; @@ -100,19 +97,10 @@ import org.eclipse.debug.core.model.IThread; * @since Aug 1, 2002 */ public class CDebugTarget extends CDebugElement - implements IDebugTarget, - ICDebugTargetType, + implements ICDebugTarget, ICDIEventListener, - IRestart, - IRunToLine, - IFormattedMemoryRetrieval, - IState, ILaunchListener, - ISwitchToThread, - IExpressionListener, - ICExpressionEvaluator, - IDebuggerProcessSupport, - IExecFileInfo + IExpressionListener { /** * The type of this target. @@ -965,31 +953,6 @@ public class CDebugTarget extends CDebugElement { } - /* (non-Javadoc) - * @see org.eclipse.cdt.debug.core.IFormattedMemoryRetrieval#getFormattedMemoryBlock(long, int, int, int, int, char) - */ - public IFormattedMemoryBlock getFormattedMemoryBlock( long startAddress, - int format, - int wordSize, - int numberOfRows, - int numberOfColumns, - char paddingChar ) throws DebugException - { - return null; - } - - /* (non-Javadoc) - * @see org.eclipse.cdt.debug.core.IFormattedMemoryRetrieval#getFormattedMemoryBlock(long, int, int, int, int) - */ - public IFormattedMemoryBlock getFormattedMemoryBlock( long startAddress, - int format, - int wordSize, - int numberOfRows, - int numberOfColumns ) throws DebugException - { - return null; - } - /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.IFormattedMemoryRetrieval#getSupportedFormats() */ diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDummyStackFrame.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDummyStackFrame.java index 0d4a4fa570e..0c0c892b2bd 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDummyStackFrame.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDummyStackFrame.java @@ -5,7 +5,7 @@ */ package org.eclipse.cdt.debug.internal.core.model; -import org.eclipse.cdt.debug.core.IDummyStackFrame; +import org.eclipse.cdt.debug.core.model.IDummyStackFrame; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.model.IRegisterGroup; import org.eclipse.debug.core.model.IStackFrame; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CFormattedMemoryBlock.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CFormattedMemoryBlock.java index e29fa2e82b3..c0367b62a14 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CFormattedMemoryBlock.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CFormattedMemoryBlock.java @@ -9,9 +9,6 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.cdt.debug.core.CDebugCorePlugin; -import org.eclipse.cdt.debug.core.IExecFileInfo; -import org.eclipse.cdt.debug.core.IFormattedMemoryBlock; -import org.eclipse.cdt.debug.core.IFormattedMemoryBlockRow; import org.eclipse.cdt.debug.core.cdi.CDIException; import org.eclipse.cdt.debug.core.cdi.event.ICDIChangedEvent; import org.eclipse.cdt.debug.core.cdi.event.ICDIDestroyedEvent; @@ -23,6 +20,9 @@ import org.eclipse.cdt.debug.core.cdi.model.ICDIExpression; 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.ICDITarget; +import org.eclipse.cdt.debug.core.model.IExecFileInfo; +import org.eclipse.cdt.debug.core.model.IFormattedMemoryBlock; +import org.eclipse.cdt.debug.core.model.IFormattedMemoryBlockRow; import org.eclipse.cdt.debug.internal.core.CDebugUtils; import org.eclipse.debug.core.DebugEvent; import org.eclipse.debug.core.DebugException; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CModificationVariable.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CModificationVariable.java index b1daaea1bd6..a94beb7465b 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CModificationVariable.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CModificationVariable.java @@ -8,10 +8,10 @@ package org.eclipse.cdt.debug.internal.core.model; import java.text.MessageFormat; -import org.eclipse.cdt.debug.core.ICValue; import org.eclipse.cdt.debug.core.cdi.CDIException; import org.eclipse.cdt.debug.core.cdi.model.ICDIValue; import org.eclipse.cdt.debug.core.cdi.model.ICDIVariable; +import org.eclipse.cdt.debug.core.model.ICValue; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.model.IValue; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CStackFrame.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CStackFrame.java index 287f3ae06c2..28e7a50c9fb 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CStackFrame.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CStackFrame.java @@ -12,8 +12,6 @@ import java.util.Iterator; import java.util.List; import org.eclipse.cdt.debug.core.CDebugCorePlugin; -import org.eclipse.cdt.debug.core.IRestart; -import org.eclipse.cdt.debug.core.IStackFrameInfo; import org.eclipse.cdt.debug.core.cdi.CDIException; import org.eclipse.cdt.debug.core.cdi.ICDILocation; import org.eclipse.cdt.debug.core.cdi.event.ICDIEvent; @@ -21,6 +19,8 @@ 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.ICDIStackFrame; import org.eclipse.cdt.debug.core.cdi.model.ICDIVariable; +import org.eclipse.cdt.debug.core.model.IRestart; +import org.eclipse.cdt.debug.core.model.IStackFrameInfo; import org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.model.IRegisterGroup; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java index 52eb17377d0..af1504b4084 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java @@ -10,12 +10,6 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.eclipse.cdt.debug.core.IDummyStackFrame; -import org.eclipse.cdt.debug.core.IInstructionStep; -import org.eclipse.cdt.debug.core.IRestart; -import org.eclipse.cdt.debug.core.IRunToLine; -import org.eclipse.cdt.debug.core.IState; -import org.eclipse.cdt.debug.core.ISwitchToFrame; import org.eclipse.cdt.debug.core.cdi.CDIException; import org.eclipse.cdt.debug.core.cdi.ICDIConfiguration; import org.eclipse.cdt.debug.core.cdi.ICDIEndSteppingRange; @@ -34,6 +28,12 @@ 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.ICDIThread; +import org.eclipse.cdt.debug.core.model.IDummyStackFrame; +import org.eclipse.cdt.debug.core.model.IInstructionStep; +import org.eclipse.cdt.debug.core.model.IRestart; +import org.eclipse.cdt.debug.core.model.IRunToLine; +import org.eclipse.cdt.debug.core.model.IState; +import org.eclipse.cdt.debug.core.model.ISwitchToFrame; import org.eclipse.cdt.debug.core.sourcelookup.ISourceMode; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IAdaptable; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValue.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValue.java index 1edc56dacba..3deac280899 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValue.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValue.java @@ -12,10 +12,10 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -import org.eclipse.cdt.debug.core.ICValue; import org.eclipse.cdt.debug.core.cdi.CDIException; import org.eclipse.cdt.debug.core.cdi.model.ICDIValue; import org.eclipse.cdt.debug.core.cdi.model.ICDIVariable; +import org.eclipse.cdt.debug.core.model.ICValue; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.model.IVariable; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValueFactory.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValueFactory.java index 054481d644f..960cfd041bb 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValueFactory.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValueFactory.java @@ -6,8 +6,8 @@ package org.eclipse.cdt.debug.internal.core.model; -import org.eclipse.cdt.debug.core.ICValue; import org.eclipse.cdt.debug.core.cdi.model.ICDIValue; +import org.eclipse.cdt.debug.core.model.ICValue; import org.eclipse.debug.core.DebugException; /** diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariable.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariable.java index 85240da9b23..93fe24c7799 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariable.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariable.java @@ -5,7 +5,6 @@ */ package org.eclipse.cdt.debug.internal.core.model; -import org.eclipse.cdt.debug.core.ICValue; import org.eclipse.cdt.debug.core.cdi.CDIException; import org.eclipse.cdt.debug.core.cdi.event.ICDIChangedEvent; import org.eclipse.cdt.debug.core.cdi.event.ICDIEvent; @@ -13,6 +12,7 @@ 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.cdt.debug.core.model.ICValue; import org.eclipse.debug.core.DebugEvent; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.model.IDebugTarget; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceLocator.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceLocator.java index e4cf0a78071..b242dcafc1a 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceLocator.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceLocator.java @@ -8,7 +8,7 @@ package org.eclipse.cdt.debug.internal.core.sourcelookup; import java.util.ArrayList; -import org.eclipse.cdt.debug.core.IStackFrameInfo; +import org.eclipse.cdt.debug.core.model.IStackFrameInfo; import org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocation; import org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator; import org.eclipse.core.resources.IFile; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceManager.java index be8137b4ddd..26a9142f393 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceManager.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceManager.java @@ -8,7 +8,7 @@ package org.eclipse.cdt.debug.internal.core.sourcelookup; import org.eclipse.cdt.debug.core.CDebugCorePlugin; import org.eclipse.cdt.debug.core.ICDebugConstants; -import org.eclipse.cdt.debug.core.IStackFrameInfo; +import org.eclipse.cdt.debug.core.model.IStackFrameInfo; import org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocation; import org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator; import org.eclipse.cdt.debug.core.sourcelookup.ISourceMode; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/DisassemblyManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/DisassemblyManager.java index 7910c889821..99ff2953905 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/DisassemblyManager.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/DisassemblyManager.java @@ -9,10 +9,10 @@ package org.eclipse.cdt.debug.internal.core.sourcelookup; import java.util.ArrayList; import org.eclipse.cdt.debug.core.CDebugCorePlugin; -import org.eclipse.cdt.debug.core.IStackFrameInfo; import org.eclipse.cdt.debug.core.cdi.CDIException; import org.eclipse.cdt.debug.core.cdi.ICDISourceManager; import org.eclipse.cdt.debug.core.cdi.model.ICDIInstruction; +import org.eclipse.cdt.debug.core.model.IStackFrameInfo; import org.eclipse.cdt.debug.internal.core.DisassemblyStorage; import org.eclipse.cdt.debug.internal.core.model.CDebugTarget; import org.eclipse.debug.core.model.IStackFrame; diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog index 674306b299b..935798875ca 100644 --- a/debug/org.eclipse.cdt.debug.ui/ChangeLog +++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog @@ -1,3 +1,6 @@ +2002-12-02 Mikhail Khodjaiants + Refactoring org.eclipse.cdt.debug.core - UI changes. + 2002-12-02 Mikhail Khodjaiants 'Run to line' and 'Add expression' actions for assembly editor. *plugin.xml diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java index 7e7e598fe53..c1c4c1f31f2 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java @@ -9,23 +9,23 @@ package org.eclipse.cdt.debug.internal.ui; import java.text.MessageFormat; import java.util.HashMap; -import org.eclipse.cdt.debug.core.ICAddressBreakpoint; -import org.eclipse.cdt.debug.core.ICBreakpoint; -import org.eclipse.cdt.debug.core.ICDebugTargetType; -import org.eclipse.cdt.debug.core.ICFunctionBreakpoint; -import org.eclipse.cdt.debug.core.ICLineBreakpoint; -import org.eclipse.cdt.debug.core.ICValue; -import org.eclipse.cdt.debug.core.ICWatchpoint; -import org.eclipse.cdt.debug.core.IDisassemblyStorage; -import org.eclipse.cdt.debug.core.IDummyStackFrame; -import org.eclipse.cdt.debug.core.IStackFrameInfo; -import org.eclipse.cdt.debug.core.IState; import org.eclipse.cdt.debug.core.cdi.ICDIBreakpointHit; import org.eclipse.cdt.debug.core.cdi.ICDIExitInfo; import org.eclipse.cdt.debug.core.cdi.ICDISession; import org.eclipse.cdt.debug.core.cdi.ICDISignal; import org.eclipse.cdt.debug.core.cdi.ICDIWatchpointScope; import org.eclipse.cdt.debug.core.cdi.ICDIWatchpointTrigger; +import org.eclipse.cdt.debug.core.model.ICAddressBreakpoint; +import org.eclipse.cdt.debug.core.model.ICBreakpoint; +import org.eclipse.cdt.debug.core.model.ICDebugTargetType; +import org.eclipse.cdt.debug.core.model.ICFunctionBreakpoint; +import org.eclipse.cdt.debug.core.model.ICLineBreakpoint; +import org.eclipse.cdt.debug.core.model.ICValue; +import org.eclipse.cdt.debug.core.model.ICWatchpoint; +import org.eclipse.cdt.debug.core.model.IDummyStackFrame; +import org.eclipse.cdt.debug.core.model.IStackFrameInfo; +import org.eclipse.cdt.debug.core.model.IState; +import org.eclipse.cdt.debug.core.sourcelookup.IDisassemblyStorage; import org.eclipse.cdt.debug.internal.ui.editors.DisassemblyEditorInput; import org.eclipse.cdt.debug.ui.CDebugUIPlugin; import org.eclipse.core.resources.IFile; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractBreakpointRulerAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractBreakpointRulerAction.java index 5d4f2fe3324..ac498d62664 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractBreakpointRulerAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractBreakpointRulerAction.java @@ -6,7 +6,7 @@ package org.eclipse.cdt.debug.internal.ui.actions; import org.eclipse.cdt.debug.core.CDebugCorePlugin; -import org.eclipse.cdt.debug.core.ICLineBreakpoint; +import org.eclipse.cdt.debug.core.model.ICLineBreakpoint; import org.eclipse.cdt.debug.ui.CDebugUIPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddExpressionActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddExpressionActionDelegate.java index b80f1fe15c5..2d817506c07 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddExpressionActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddExpressionActionDelegate.java @@ -6,7 +6,7 @@ package org.eclipse.cdt.debug.internal.ui.actions; import org.eclipse.cdt.debug.core.CDebugModel; -import org.eclipse.cdt.debug.core.ICExpressionEvaluator; +import org.eclipse.cdt.debug.core.model.ICExpressionEvaluator; import org.eclipse.cdt.debug.ui.CDebugUIPlugin; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.debug.core.DebugException; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddGlobalsActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddGlobalsActionDelegate.java index f3cee867a6a..927577ae201 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddGlobalsActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddGlobalsActionDelegate.java @@ -6,8 +6,8 @@ package org.eclipse.cdt.debug.internal.ui.actions; import org.eclipse.cdt.debug.core.CDebugModel; -import org.eclipse.cdt.debug.core.IExecFileInfo; -import org.eclipse.cdt.debug.core.IGlobalVariable; +import org.eclipse.cdt.debug.core.model.IExecFileInfo; +import org.eclipse.cdt.debug.core.model.IGlobalVariable; import org.eclipse.cdt.debug.ui.CDebugUIPlugin; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPreferencePage.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPreferencePage.java index 592510ae119..56512447f9f 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPreferencePage.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPreferencePage.java @@ -5,8 +5,8 @@ */ package org.eclipse.cdt.debug.internal.ui.actions; -import org.eclipse.cdt.debug.core.ICBreakpoint; -import org.eclipse.cdt.debug.core.ICWatchpoint; +import org.eclipse.cdt.debug.core.model.ICBreakpoint; +import org.eclipse.cdt.debug.core.model.ICWatchpoint; import org.eclipse.cdt.debug.ui.CDebugUIPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.debug.core.model.ILineBreakpoint; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPropertiesAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPropertiesAction.java index c217fbaf98d..f42180d0ebc 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPropertiesAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPropertiesAction.java @@ -5,7 +5,7 @@ */ package org.eclipse.cdt.debug.internal.ui.actions; -import org.eclipse.cdt.debug.core.ICBreakpoint; +import org.eclipse.cdt.debug.core.model.ICBreakpoint; import org.eclipse.jface.action.IAction; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.viewers.ISelection; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPropertiesDialog.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPropertiesDialog.java index e2a70cfa74b..f300056a823 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPropertiesDialog.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPropertiesDialog.java @@ -9,7 +9,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.eclipse.cdt.debug.core.ICBreakpoint; +import org.eclipse.cdt.debug.core.model.ICBreakpoint; import org.eclipse.cdt.debug.ui.CDebugUIPlugin; import org.eclipse.core.resources.IWorkspaceRunnable; import org.eclipse.core.resources.ResourcesPlugin; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPropertiesRulerAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPropertiesRulerAction.java index e90df7e0828..0e5e6863cc8 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPropertiesRulerAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPropertiesRulerAction.java @@ -5,7 +5,7 @@ */ package org.eclipse.cdt.debug.internal.ui.actions; -import org.eclipse.cdt.debug.core.ICBreakpoint; +import org.eclipse.cdt.debug.core.model.ICBreakpoint; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.source.IVerticalRulerInfo; import org.eclipse.ui.texteditor.ITextEditor; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/DebuggerConsoleActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/DebuggerConsoleActionDelegate.java index 4fe5d6f2356..252dfdf93cc 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/DebuggerConsoleActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/DebuggerConsoleActionDelegate.java @@ -5,7 +5,7 @@ */ package org.eclipse.cdt.debug.internal.ui.actions; -import org.eclipse.cdt.debug.core.IDebuggerProcessSupport; +import org.eclipse.cdt.debug.core.model.IDebuggerProcessSupport; import org.eclipse.cdt.debug.internal.core.model.CDebugElement; import org.eclipse.debug.core.DebugEvent; import org.eclipse.debug.core.DebugException; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ManageBreakpointActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ManageBreakpointActionDelegate.java index e6e654f2f4e..9bda93e3c94 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ManageBreakpointActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ManageBreakpointActionDelegate.java @@ -6,7 +6,7 @@ package org.eclipse.cdt.debug.internal.ui.actions; import org.eclipse.cdt.debug.core.CDebugModel; -import org.eclipse.cdt.debug.core.ICLineBreakpoint; +import org.eclipse.cdt.debug.core.model.ICLineBreakpoint; import org.eclipse.cdt.debug.ui.CDebugUIPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/MemoryFormatAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/MemoryFormatAction.java index 3b78ab0d6a0..54790c11804 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/MemoryFormatAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/MemoryFormatAction.java @@ -5,7 +5,7 @@ */ package org.eclipse.cdt.debug.internal.ui.actions; -import org.eclipse.cdt.debug.core.IFormattedMemoryBlock; +import org.eclipse.cdt.debug.core.model.IFormattedMemoryBlock; import org.eclipse.cdt.debug.internal.ui.views.memory.MemoryViewer; import org.eclipse.cdt.debug.ui.CDebugUIPlugin; import org.eclipse.debug.core.DebugException; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/MemorySizeAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/MemorySizeAction.java index f08ce62da55..edf235abdbe 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/MemorySizeAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/MemorySizeAction.java @@ -5,7 +5,7 @@ */ package org.eclipse.cdt.debug.internal.ui.actions; -import org.eclipse.cdt.debug.core.IFormattedMemoryBlock; +import org.eclipse.cdt.debug.core.model.IFormattedMemoryBlock; import org.eclipse.cdt.debug.internal.ui.views.memory.MemoryViewer; import org.eclipse.cdt.debug.ui.CDebugUIPlugin; import org.eclipse.debug.core.DebugException; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RestartActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RestartActionDelegate.java index 80d67deeb57..011931efcd6 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RestartActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RestartActionDelegate.java @@ -5,7 +5,7 @@ */ package org.eclipse.cdt.debug.internal.ui.actions; -import org.eclipse.cdt.debug.core.IRestart; +import org.eclipse.cdt.debug.core.model.IRestart; import org.eclipse.debug.core.DebugException; /** diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RunToLineActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RunToLineActionDelegate.java index 6ee00eb4410..08c40f08432 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RunToLineActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RunToLineActionDelegate.java @@ -5,7 +5,7 @@ */ package org.eclipse.cdt.debug.internal.ui.actions; -import org.eclipse.cdt.debug.core.IRunToLine; +import org.eclipse.cdt.debug.core.model.IRunToLine; import org.eclipse.cdt.debug.ui.CDebugUIPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RunToLineRulerAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RunToLineRulerAction.java index 9da8be4802a..218764a647b 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RunToLineRulerAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RunToLineRulerAction.java @@ -5,7 +5,7 @@ */ package org.eclipse.cdt.debug.internal.ui.actions; -import org.eclipse.cdt.debug.core.IRunToLine; +import org.eclipse.cdt.debug.core.model.IRunToLine; import org.eclipse.cdt.debug.ui.CDebugUIPlugin; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IAdaptable; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/editors/DebugTextHover.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/editors/DebugTextHover.java index 669f98ba21a..d516b0b0127 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/editors/DebugTextHover.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/editors/DebugTextHover.java @@ -10,7 +10,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.eclipse.cdt.debug.core.ICExpressionEvaluator; +import org.eclipse.cdt.debug.core.model.ICExpressionEvaluator; import org.eclipse.cdt.debug.internal.ui.CDebugUIUtils; import org.eclipse.cdt.debug.ui.CDebugUIPlugin; import org.eclipse.debug.core.DebugException; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryControlArea.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryControlArea.java index 7ceffd8ad6f..d3bba69f064 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryControlArea.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryControlArea.java @@ -8,7 +8,7 @@ package org.eclipse.cdt.debug.internal.ui.views.memory; import org.eclipse.cdt.debug.core.CDebugModel; import org.eclipse.cdt.debug.core.ICMemoryManager; -import org.eclipse.cdt.debug.core.IFormattedMemoryBlock; +import org.eclipse.cdt.debug.core.model.IFormattedMemoryBlock; import org.eclipse.cdt.debug.internal.ui.CDebugUIUtils; import org.eclipse.cdt.debug.internal.ui.preferences.ICDebugPreferenceConstants; import org.eclipse.cdt.debug.ui.CDebugUIPlugin; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryPresentation.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryPresentation.java index 1d240716cc8..82adfaaac7c 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryPresentation.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryPresentation.java @@ -11,8 +11,8 @@ import java.util.LinkedList; import java.util.List; import org.eclipse.cdt.debug.core.ICMemoryManager; -import org.eclipse.cdt.debug.core.IFormattedMemoryBlock; -import org.eclipse.cdt.debug.core.IFormattedMemoryBlockRow; +import org.eclipse.cdt.debug.core.model.IFormattedMemoryBlock; +import org.eclipse.cdt.debug.core.model.IFormattedMemoryBlockRow; import org.eclipse.cdt.debug.internal.core.CDebugUtils; import org.eclipse.cdt.debug.internal.ui.CDebugUIUtils; import org.eclipse.debug.core.DebugException; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryView.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryView.java index fe2ec96cdf3..480642a8730 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryView.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryView.java @@ -6,7 +6,7 @@ package org.eclipse.cdt.debug.internal.ui.views.memory; import org.eclipse.cdt.debug.core.ICMemoryManager; -import org.eclipse.cdt.debug.core.IFormattedMemoryBlock; +import org.eclipse.cdt.debug.core.model.IFormattedMemoryBlock; import org.eclipse.cdt.debug.internal.ui.ICDebugHelpContextIds; import org.eclipse.cdt.debug.internal.ui.actions.AutoRefreshMemoryAction; import org.eclipse.cdt.debug.internal.ui.actions.ClearMemoryAction; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryViewEventHandler.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryViewEventHandler.java index 94b5100b3a3..3af418fd3e9 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryViewEventHandler.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryViewEventHandler.java @@ -5,7 +5,7 @@ */ package org.eclipse.cdt.debug.internal.ui.views.memory; -import org.eclipse.cdt.debug.core.IFormattedMemoryBlock; +import org.eclipse.cdt.debug.core.model.IFormattedMemoryBlock; import org.eclipse.cdt.debug.internal.ui.views.AbstractDebugEventHandler; import org.eclipse.debug.core.DebugEvent; import org.eclipse.debug.ui.AbstractDebugView; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryViewer.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryViewer.java index a087f190796..9d0adccb4fa 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryViewer.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryViewer.java @@ -6,7 +6,7 @@ package org.eclipse.cdt.debug.internal.ui.views.memory; import org.eclipse.cdt.debug.core.ICMemoryManager; -import org.eclipse.cdt.debug.core.IFormattedMemoryBlock; +import org.eclipse.cdt.debug.core.model.IFormattedMemoryBlock; import org.eclipse.debug.core.DebugException; import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.jface.viewers.ContentViewer; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/CDebugUIPlugin.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/CDebugUIPlugin.java index 663352b12de..e13348e5db0 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/CDebugUIPlugin.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/CDebugUIPlugin.java @@ -5,9 +5,9 @@ import java.util.Map; import java.util.MissingResourceException; import java.util.ResourceBundle; -import org.eclipse.cdt.debug.core.IDisassemblyStorage; -import org.eclipse.cdt.debug.core.ISwitchToFrame; -import org.eclipse.cdt.debug.core.ISwitchToThread; +import org.eclipse.cdt.debug.core.model.ISwitchToFrame; +import org.eclipse.cdt.debug.core.model.ISwitchToThread; +import org.eclipse.cdt.debug.core.sourcelookup.IDisassemblyStorage; import org.eclipse.cdt.debug.internal.ui.CDTDebugModelPresentation; import org.eclipse.cdt.debug.internal.ui.CDebugImageDescriptorRegistry; import org.eclipse.cdt.debug.internal.ui.ColorManager; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/CUISourceLocator.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/CUISourceLocator.java index 7bb8c206733..972d015ab6b 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/CUISourceLocator.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/CUISourceLocator.java @@ -7,7 +7,7 @@ package org.eclipse.cdt.debug.ui; import java.text.MessageFormat; -import org.eclipse.cdt.debug.core.IStackFrameInfo; +import org.eclipse.cdt.debug.core.model.IStackFrameInfo; import org.eclipse.cdt.debug.internal.core.sourcelookup.CSourceLocator; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException;