diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog index 06cf08dd5d5..0df8ffb28c1 100644 --- a/debug/org.eclipse.cdt.debug.ui/ChangeLog +++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog @@ -1,3 +1,12 @@ +2005-02-02 Mikhail Khodjaiants + The "INTERNAL_ERROR" constant has been moved from ICDebugUIConstants to IInternalCDebugUIConstants. + * IInternalCDebugUIConstants.java + * ICDebugUIConstants.java + * ResumeAtLineAdapter.java + * RunToLineAdapter.java + * ToggleBreakpointAdapter.java + * CDebugUIPlugin.java + 2005-02-02 Mikhail Khodjaiants Fix for bug 84187: "Toggle Watchpoint" and "Toggle Method Breakpoint" don't work with C editor. * ToggleBreakpointAdapter.java diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/IInternalCDebugUIConstants.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/IInternalCDebugUIConstants.java index fe1525a1cd9..743218fb68d 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/IInternalCDebugUIConstants.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/IInternalCDebugUIConstants.java @@ -57,4 +57,15 @@ public interface IInternalCDebugUIConstants { public static final String ACTION_TOGGLE_BREAKPOINT = PREFIX + "toggleBreakpoint"; //$NON-NLS-1$ public static final String ACTION_ENABLE_DISABLE_BREAKPOINT = PREFIX + "enableDisableBreakpoint"; //$NON-NLS-1$ public static final String ACTION_BREAKPOINT_PROPERTIES = PREFIX + "breakpointProperties"; //$NON-NLS-1$ + + /** + * The name of the font to use for detail panes. This font is managed via + * the workbench font preference page. + */ + public static final String DETAIL_PANE_FONT = PREFIX + "DetailPaneFont"; //$NON-NLS-1$ + + /** + * Status code indicating an unexpected internal error. + */ + public static final int INTERNAL_ERROR = 150; } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ResumeAtLineAdapter.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ResumeAtLineAdapter.java index d4f91f2ddb9..fb7bfea430c 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ResumeAtLineAdapter.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ResumeAtLineAdapter.java @@ -16,10 +16,10 @@ import org.eclipse.cdt.debug.core.CDebugUtils; import org.eclipse.cdt.debug.core.model.IJumpToAddress; import org.eclipse.cdt.debug.core.model.IJumpToLine; import org.eclipse.cdt.debug.internal.core.ICDebugInternalConstants; +import org.eclipse.cdt.debug.internal.ui.IInternalCDebugUIConstants; import org.eclipse.cdt.debug.internal.ui.views.disassembly.DisassemblyEditorInput; import org.eclipse.cdt.debug.internal.ui.views.disassembly.DisassemblyView; import org.eclipse.cdt.debug.ui.CDebugUIPlugin; -import org.eclipse.cdt.debug.ui.ICDebugUIConstants; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IStatus; @@ -116,7 +116,7 @@ public class ResumeAtLineAdapter implements IResumeAtLineTarget { else { errorMessage = ActionMessages.getString( "ResumeAtLineAdapter.3" ); //$NON-NLS-1$ } - throw new CoreException( new Status( IStatus.ERROR, CDebugUIPlugin.getUniqueIdentifier(), ICDebugUIConstants.INTERNAL_ERROR, errorMessage, null ) ); + throw new CoreException( new Status( IStatus.ERROR, CDebugUIPlugin.getUniqueIdentifier(), IInternalCDebugUIConstants.INTERNAL_ERROR, errorMessage, null ) ); } /* (non-Javadoc) diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RunToLineAdapter.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RunToLineAdapter.java index 7ae3ce15cf5..f591289dcd8 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RunToLineAdapter.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RunToLineAdapter.java @@ -16,10 +16,10 @@ import org.eclipse.cdt.debug.core.CDebugUtils; import org.eclipse.cdt.debug.core.model.IRunToAddress; import org.eclipse.cdt.debug.core.model.IRunToLine; import org.eclipse.cdt.debug.internal.core.ICDebugInternalConstants; +import org.eclipse.cdt.debug.internal.ui.IInternalCDebugUIConstants; import org.eclipse.cdt.debug.internal.ui.views.disassembly.DisassemblyEditorInput; import org.eclipse.cdt.debug.internal.ui.views.disassembly.DisassemblyView; import org.eclipse.cdt.debug.ui.CDebugUIPlugin; -import org.eclipse.cdt.debug.ui.ICDebugUIConstants; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IStatus; @@ -119,7 +119,7 @@ public class RunToLineAdapter implements IRunToLineTarget { else { errorMessage = ActionMessages.getString( "RunToLineAdapter.Operation_is_not_supported_1" ); //$NON-NLS-1$ } - throw new CoreException( new Status( IStatus.ERROR, CDebugUIPlugin.getUniqueIdentifier(), ICDebugUIConstants.INTERNAL_ERROR, errorMessage, null ) ); + throw new CoreException( new Status( IStatus.ERROR, CDebugUIPlugin.getUniqueIdentifier(), IInternalCDebugUIConstants.INTERNAL_ERROR, errorMessage, null ) ); } /* (non-Javadoc) 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 907993e704a..c7a662e233f 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 @@ -18,6 +18,7 @@ import org.eclipse.cdt.debug.internal.ui.CDTDebugModelPresentation; import org.eclipse.cdt.debug.internal.ui.CDebugImageDescriptorRegistry; import org.eclipse.cdt.debug.internal.ui.ColorManager; import org.eclipse.cdt.debug.internal.ui.EvaluationContextManager; +import org.eclipse.cdt.debug.internal.ui.IInternalCDebugUIConstants; import org.eclipse.cdt.debug.ui.sourcelookup.DefaultSourceLocator; import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.ResourcesPlugin; @@ -120,7 +121,7 @@ public class CDebugUIPlugin extends AbstractUIPlugin { * the exception to be logged */ public static void log( Throwable e ) { - log( new Status( IStatus.ERROR, getUniqueIdentifier(), ICDebugUIConstants.INTERNAL_ERROR, "Internal Error", e ) ); //$NON-NLS-1$ + log( new Status( IStatus.ERROR, getUniqueIdentifier(), IInternalCDebugUIConstants.INTERNAL_ERROR, "Internal Error", e ) ); //$NON-NLS-1$ } /** @@ -130,7 +131,7 @@ public class CDebugUIPlugin extends AbstractUIPlugin { * the error message to log */ public static void logErrorMessage( String message ) { - log( new Status( IStatus.ERROR, getUniqueIdentifier(), ICDebugUIConstants.INTERNAL_ERROR, message, null ) ); + log( new Status( IStatus.ERROR, getUniqueIdentifier(), IInternalCDebugUIConstants.INTERNAL_ERROR, message, null ) ); } public ILaunchConfigurationTab getDebuggerPage( String debuggerID ) throws CoreException { @@ -167,7 +168,7 @@ public class CDebugUIPlugin extends AbstractUIPlugin { log( t ); Shell shell = getActiveWorkbenchShell(); if ( shell != null ) { - IStatus status = new Status( IStatus.ERROR, getUniqueIdentifier(), ICDebugUIConstants.INTERNAL_ERROR, t.getMessage(), null ); //$NON-NLS-1$ + IStatus status = new Status( IStatus.ERROR, getUniqueIdentifier(), IInternalCDebugUIConstants.INTERNAL_ERROR, t.getMessage(), null ); //$NON-NLS-1$ ErrorDialog.openError( shell, UIMessages.getString( "CDebugUIPlugin.0" ), message, status ); //$NON-NLS-1$ } } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/ICDebugUIConstants.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/ICDebugUIConstants.java index 5bee42a3281..e6789fcdc1b 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/ICDebugUIConstants.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/ICDebugUIConstants.java @@ -8,62 +8,33 @@ * Contributors: * QNX Software Systems - Initial API and implementation *******************************************************************************/ - package org.eclipse.cdt.debug.ui; - - /** - * * Constant definitions for C/C++ Debug UI plug-in. - * - * @since Jul 23, 2002 */ -public interface ICDebugUIConstants -{ +public interface ICDebugUIConstants { /** * C/C++ Debug UI plug-in identifier (value "org.eclipse.cdt.debug.ui"). */ public static final String PLUGIN_ID = CDebugUIPlugin.getUniqueIdentifier(); - // Debug views + public static final String PREFIX = PLUGIN_ID + "."; //$NON-NLS-1$ /** - * Registers view identifier (value "org.eclipse.cdt.debug.ui.RegitersView"). + * Modules view identifier (value "org.eclipse.cdt.debug.ui.ModulesView"). */ - public static final String ID_REGISTERS_VIEW = "org.eclipse.cdt.debug.ui.RegitersView"; //$NON-NLS-1$ - - /** - * Memory view identifier (value "org.eclipse.cdt.debug.ui.MemoryView"). - */ - public static final String ID_MEMORY_VIEW = "org.eclipse.cdt.debug.ui.MemoryView"; //$NON-NLS-1$ + public static final String ID_MODULES_VIEW = PREFIX + "ModulesView"; //$NON-NLS-1$ /** - * Status code indicating an unexpected internal error. + * Id for the popup menu associated with the variables (tree viewer) part of the VariableView */ - public static final int INTERNAL_ERROR = 150; + public static final String MODULES_VIEW_MODULES_ID = PREFIX + "ModulesView.modules"; //$NON-NLS-1$ - /** - * Identifier for an empty group preceeding a - * register group in a menu (value "emptyRegisterGroup"). - */ - public static final String EMPTY_REGISTER_GROUP = "emptyRegisterGroup"; //$NON-NLS-1$ - /** - * Identifier for a register group in a menu (value "registerGroup"). + * Id for the popup menu associated with the detail (text viewer) part of the Modules view */ - public static final String REGISTER_GROUP = "registerGroup"; //$NON-NLS-1$ - - /** - * Identifier for an empty group preceeding a - * memory group in a menu (value "emptyMemoryGroup"). - */ - public static final String EMPTY_MEMORY_GROUP = "emptyMemoryGroup"; //$NON-NLS-1$ - - /** - * Identifier for a memory group in a menu (value "memoryGroup"). - */ - public static final String MEMORY_GROUP = "memoryGroup"; //$NON-NLS-1$ + public static final String MODULES_VIEW_DETAIL_ID = PREFIX + "ModulesView.detail"; //$NON-NLS-1$ /** * Identifier for an empty group preceeding a @@ -87,6 +58,7 @@ public interface ICDebugUIConstants * ). */ public static final String REFRESH_GROUP = "refreshGroup"; //$NON-NLS-1$ + /** * Identifier for an empty group preceeding a * shared libraries group in a menu (value " @@ -101,4 +73,15 @@ public interface ICDebugUIConstants * ). */ public static final String SHARED_LIBRARIES_GROUP = "sharedLibrariesGroup"; //$NON-NLS-1$ + + /** + * Identifier for an empty group preceeding a + * modules group in a menu (value "emptyModulesGroup"). + */ + public static final String EMPTY_MODULES_GROUP = "emptyModulesGroup"; //$NON-NLS-1$ + + /** + * Identifier for a shared libraries group in a menu (value "modulesGroup"). + */ + public static final String MODULES_GROUP = "modulesGroup"; //$NON-NLS-1$ }