diff options
author | Pawel Piech | 2012-01-18 23:07:16 +0000 |
---|---|---|
committer | Pawel Piech | 2012-01-18 23:08:22 +0000 |
commit | 4627f4d8306a47a42f55bfc62a92670eade4c12f (patch) | |
tree | 3ad01c1879cf15770879db680e4945fa8d63b3da /org.eclipse.debug.ui/ui/org/eclipse/debug | |
parent | 9635e7ba2371b094c3468f0100800b68366765d1 (diff) | |
download | eclipse.platform.debug-4627f4d8306a47a42f55bfc62a92670eade4c12f.tar.gz eclipse.platform.debug-4627f4d8306a47a42f55bfc62a92670eade4c12f.tar.xz eclipse.platform.debug-4627f4d8306a47a42f55bfc62a92670eade4c12f.zip |
Bug 340710 - [var][expr][reg] Make the default variable view column IDs
public.
Diffstat (limited to 'org.eclipse.debug.ui/ui/org/eclipse/debug')
11 files changed, 107 insertions, 58 deletions
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/EditWatchExpressinInPlaceAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/EditWatchExpressinInPlaceAction.java index fffbdd2bc..d4fdc434f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/EditWatchExpressinInPlaceAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/EditWatchExpressinInPlaceAction.java @@ -11,9 +11,9 @@ package org.eclipse.debug.internal.ui.actions.expressions; import org.eclipse.debug.core.model.IWatchExpression; -import org.eclipse.debug.internal.ui.elements.adapters.VariableColumnPresentation; import org.eclipse.debug.internal.ui.viewers.model.provisional.TreeModelViewer; import org.eclipse.debug.internal.ui.views.expression.ExpressionView; +import org.eclipse.debug.ui.IDebugUIConstants; import org.eclipse.jface.action.Action; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.ISelectionProvider; @@ -75,7 +75,7 @@ public class EditWatchExpressinInPlaceAction extends Action implements ISelectio private int getExpressionColumnIndex() { Object[] columnProperties = fViewer.getColumnProperties(); for (int i = 0; columnProperties != null && i < columnProperties.length; i++) { - if (VariableColumnPresentation.COLUMN_VARIABLE_NAME.equals(columnProperties[i])) { + if (IDebugUIConstants.COLUMN_ID_VARIABLE_NAME.equals(columnProperties[i])) { return i; } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/VariableColumnFactoryAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/VariableColumnFactoryAdapter.java index 79d3e8f7c..e26e5e97f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/VariableColumnFactoryAdapter.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/VariableColumnFactoryAdapter.java @@ -51,7 +51,7 @@ public class VariableColumnFactoryAdapter implements IColumnPresentationFactory IDebugUIConstants.ID_EXPRESSION_VIEW.equals(id)) { if (element instanceof IStackFrame || element instanceof IExpressionManager) { - return VariableColumnPresentation.DEFAULT_VARIABLE_COLUMN_PRESENTATION; + return IDebugUIConstants.COLUMN_PRESENTATION_ID_VARIABLE; } } return null; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/VariableColumnPresentation.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/VariableColumnPresentation.java index 961e340bf..191c48363 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/VariableColumnPresentation.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/VariableColumnPresentation.java @@ -22,19 +22,32 @@ public class VariableColumnPresentation extends AbstractColumnPresentation { /** * Constant identifier for the default variable column presentation. + * @deprecated Replaced by {@link IDebugUIConstants#COLUMN_PRESENTATION_ID_VARIABLE} */ - public final static String DEFAULT_VARIABLE_COLUMN_PRESENTATION = IDebugUIConstants.PLUGIN_ID + ".VARIALBE_COLUMN_PRESENTATION"; //$NON-NLS-1$ + public final static String DEFAULT_VARIABLE_COLUMN_PRESENTATION = IDebugUIConstants.COLUMN_PRESENTATION_ID_VARIABLE; /** * Default column identifiers + * @deprecated Replaced by {@link IDebugUIConstants#COLUMN_ID_VARIABLE_NAME} */ - public final static String COLUMN_VARIABLE_NAME = DEFAULT_VARIABLE_COLUMN_PRESENTATION + ".COL_VAR_NAME"; //$NON-NLS-1$ - public final static String COLUMN_VARIABLE_TYPE = DEFAULT_VARIABLE_COLUMN_PRESENTATION + ".COL_VAR_TYPE"; //$NON-NLS-1$ - public final static String COLUMN_VARIABLE_VALUE = DEFAULT_VARIABLE_COLUMN_PRESENTATION + ".COL_VAR_VALUE"; //$NON-NLS-1$ - public final static String COLUMN_VALUE_TYPE = DEFAULT_VARIABLE_COLUMN_PRESENTATION + ".COL_VALUE_TYPE"; //$NON-NLS-1$ + public final static String COLUMN_VARIABLE_NAME = IDebugUIConstants.COLUMN_ID_VARIABLE_NAME; + /** + * @deprecated Replaced by {@link IDebugUIConstants#COLUMN_ID_VARIABLE_TYPE} + */ + public final static String COLUMN_VARIABLE_TYPE = IDebugUIConstants.COLUMN_ID_VARIABLE_TYPE; + /** + * @deprecated Replaced by {@link IDebugUIConstants#COLUMN_ID_VARIABLE_VALUE} + */ + public final static String COLUMN_VARIABLE_VALUE = IDebugUIConstants.COLUMN_ID_VARIABLE_VALUE; + /** + * @deprecated Replaced by {@link IDebugUIConstants#COLUMN_ID_VARIABLE_VALUE_TYPE} + */ + public final static String COLUMN_VALUE_TYPE = IDebugUIConstants.COLUMN_ID_VARIABLE_VALUE_TYPE; - private static final String[] ALL_COLUMNS = new String[]{COLUMN_VARIABLE_NAME, COLUMN_VARIABLE_TYPE, COLUMN_VARIABLE_VALUE, COLUMN_VALUE_TYPE}; - private static final String[] INITIAL_COLUMNS = new String[]{COLUMN_VARIABLE_NAME, COLUMN_VARIABLE_VALUE}; + private static final String[] ALL_COLUMNS = new String[]{IDebugUIConstants.COLUMN_ID_VARIABLE_NAME, + IDebugUIConstants.COLUMN_ID_VARIABLE_TYPE, IDebugUIConstants.COLUMN_ID_VARIABLE_VALUE, IDebugUIConstants.COLUMN_ID_VARIABLE_VALUE_TYPE}; + private static final String[] INITIAL_COLUMNS = new String[]{IDebugUIConstants.COLUMN_ID_VARIABLE_NAME, + IDebugUIConstants.COLUMN_ID_VARIABLE_VALUE}; /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.provisional.IColumnPresentation#getColumns() @@ -47,16 +60,16 @@ public class VariableColumnPresentation extends AbstractColumnPresentation { * @see org.eclipse.debug.internal.ui.viewers.provisional.IColumnPresentation#getHeader(java.lang.String) */ public String getHeader(String id) { - if (COLUMN_VARIABLE_TYPE.equals(id)) { + if (IDebugUIConstants.COLUMN_ID_VARIABLE_TYPE.equals(id)) { return Messages.VariableColumnPresentation_0; } - if (COLUMN_VARIABLE_NAME.equals(id)) { + if (IDebugUIConstants.COLUMN_ID_VARIABLE_NAME.equals(id)) { return Messages.VariableColumnPresentation_1; } - if (COLUMN_VARIABLE_VALUE.equals(id)) { + if (IDebugUIConstants.COLUMN_ID_VARIABLE_VALUE.equals(id)) { return Messages.VariableColumnPresentation_2; } - if (COLUMN_VALUE_TYPE.equals(id)) { + if (IDebugUIConstants.COLUMN_ID_VARIABLE_VALUE_TYPE.equals(id)) { return Messages.VariableColumnPresentation_3; } return null; @@ -66,7 +79,7 @@ public class VariableColumnPresentation extends AbstractColumnPresentation { * @see org.eclipse.debug.internal.ui.viewers.provisional.IColumnPresentation#getId() */ public String getId() { - return DEFAULT_VARIABLE_COLUMN_PRESENTATION; + return IDebugUIConstants.COLUMN_PRESENTATION_ID_VARIABLE; } /* (non-Javadoc) diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ExpressionContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ExpressionContentProvider.java index 67628f2d9..e83949816 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ExpressionContentProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ExpressionContentProvider.java @@ -23,7 +23,6 @@ import org.eclipse.debug.core.model.IErrorReportingExpression; import org.eclipse.debug.core.model.IExpression; import org.eclipse.debug.core.model.IValue; import org.eclipse.debug.internal.core.IInternalDebugCoreConstants; -import org.eclipse.debug.internal.ui.elements.adapters.VariableColumnPresentation; import org.eclipse.debug.internal.ui.viewers.model.ViewerAdapterService; import org.eclipse.debug.internal.ui.viewers.model.ViewerUpdateMonitor; import org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenCountUpdate; @@ -64,7 +63,7 @@ public class ExpressionContentProvider extends VariableContentProvider { updateLabel(updates[i], 0); } else { for (int j = 0; j < columnIds.length; j++) { - if (VariableColumnPresentation.COLUMN_VARIABLE_NAME.equals(columnIds[j])) { + if (IDebugUIConstants.COLUMN_ID_VARIABLE_NAME.equals(columnIds[j])) { updateLabel(updates[i], j); } else { updates[i].setLabel(IInternalDebugCoreConstants.EMPTY_STRING, j); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ExpressionLabelProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ExpressionLabelProvider.java index 2f0644f72..b408a7d02 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ExpressionLabelProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ExpressionLabelProvider.java @@ -17,8 +17,8 @@ import org.eclipse.debug.core.model.IExpression; import org.eclipse.debug.core.model.IValue; import org.eclipse.debug.core.model.IWatchExpression; import org.eclipse.debug.internal.ui.DebugUIMessages; -import org.eclipse.debug.internal.ui.elements.adapters.VariableColumnPresentation; import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext; +import org.eclipse.debug.ui.IDebugUIConstants; import org.eclipse.jface.viewers.TreePath; import org.eclipse.swt.graphics.RGB; @@ -35,7 +35,7 @@ public class ExpressionLabelProvider extends VariableLabelProvider { if (element instanceof IErrorReportingExpression) { IErrorReportingExpression expression = (IErrorReportingExpression) element; if (expression.hasErrors()) { - if (columnId == null || columnId.equals(VariableColumnPresentation.COLUMN_VARIABLE_VALUE)) { + if (columnId == null || columnId.equals(IDebugUIConstants.COLUMN_ID_VARIABLE_VALUE)) { return new RGB(255, 0, 0); } } @@ -61,17 +61,17 @@ public class ExpressionLabelProvider extends VariableLabelProvider { * @param context presentation context specifying how to display the text * @param columnId the column to get the text for * @return the label text - * @throws CoreException + * @throws CoreException Error while retrieving data from model. * * @since 3.6 */ private String getColumnText(IExpression expression, IValue value, IPresentationContext context, String columnId) throws CoreException { - if (VariableColumnPresentation.COLUMN_VARIABLE_NAME.equals(columnId)) { + if (IDebugUIConstants.COLUMN_ID_VARIABLE_NAME.equals(columnId)) { return getExpressionName(expression, context); - } else if (VariableColumnPresentation.COLUMN_VARIABLE_VALUE.equals(columnId)) { + } else if (IDebugUIConstants.COLUMN_ID_VARIABLE_VALUE.equals(columnId)) { return getExpressionValueText(expression, value, context); - } else if (VariableColumnPresentation.COLUMN_VALUE_TYPE.equals(columnId) || - VariableColumnPresentation.COLUMN_VARIABLE_TYPE.equals(columnId)) + } else if (IDebugUIConstants.COLUMN_ID_VARIABLE_TYPE.equals(columnId) || + IDebugUIConstants.COLUMN_ID_VARIABLE_VALUE_TYPE.equals(columnId)) { if (value != null) { return getValueTypeName(null, value, context); @@ -85,6 +85,7 @@ public class ExpressionLabelProvider extends VariableLabelProvider { * * @param expression expression to retrieve text for * @param context presentation context specifying how to display the text + * @return Returns the expression's text to show in the view's name column. * @exception CoreException in an error occurs * @since 3.6 */ @@ -100,6 +101,7 @@ public class ExpressionLabelProvider extends VariableLabelProvider { * * @param expression the expression * @param context associated presentation context + * @return Returns the watch expression's text to show in the view's name column. * @since 3.6 */ private String getWatchExpressionName(IWatchExpression expression, IPresentationContext context) { @@ -131,7 +133,7 @@ public class ExpressionLabelProvider extends VariableLabelProvider { * @param value the value associated with the variable * @param context presentation context specifying how to display the text * @return string representing the expression's value - * @throws CoreException + * @throws CoreException Error while retrieving data from model. * * @since 3.6 */ diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ExpressionManagerContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ExpressionManagerContentProvider.java index 1ab49398c..76e698685 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ExpressionManagerContentProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ExpressionManagerContentProvider.java @@ -22,7 +22,6 @@ import org.eclipse.debug.internal.core.IInternalDebugCoreConstants; import org.eclipse.debug.internal.ui.DebugUIMessages; import org.eclipse.debug.internal.ui.DefaultLabelProvider; import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; -import org.eclipse.debug.internal.ui.elements.adapters.VariableColumnPresentation; import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementEditor; import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementLabelProvider; import org.eclipse.debug.internal.ui.viewers.model.provisional.ILabelUpdate; @@ -58,7 +57,7 @@ public class ExpressionManagerContentProvider extends ElementContentProvider { updateLabel(updates[i], 0); } else { for (int j = 0; j < columnIds.length; j++) { - if (VariableColumnPresentation.COLUMN_VARIABLE_NAME.equals(columnIds[j])) { + if (IDebugUIConstants.COLUMN_ID_VARIABLE_NAME.equals(columnIds[j])) { updateLabel(updates[i], j); } else { updates[i].setLabel(IInternalDebugCoreConstants.EMPTY_STRING, j); @@ -90,7 +89,7 @@ public class ExpressionManagerContentProvider extends ElementContentProvider { } public boolean canModify(Object element, String property) { - return (VariableColumnPresentation.COLUMN_VARIABLE_NAME.equals(property)); + return (IDebugUIConstants.COLUMN_ID_VARIABLE_NAME.equals(property)); } public Object getValue(Object element, String property) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/RegisterGroupLabelProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/RegisterGroupLabelProvider.java index cc04c51c8..db1f81b6a 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/RegisterGroupLabelProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/RegisterGroupLabelProvider.java @@ -12,8 +12,8 @@ package org.eclipse.debug.internal.ui.model.elements; import org.eclipse.core.runtime.CoreException; import org.eclipse.debug.internal.core.IInternalDebugCoreConstants; -import org.eclipse.debug.internal.ui.elements.adapters.VariableColumnPresentation; import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext; +import org.eclipse.debug.ui.IDebugUIConstants; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.TreePath; @@ -26,7 +26,7 @@ public class RegisterGroupLabelProvider extends DebugElementLabelProvider { * @see org.eclipse.debug.internal.ui.model.elements.DebugElementLabelProvider#getImageDescriptor(org.eclipse.jface.viewers.TreePath, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, java.lang.String) */ protected ImageDescriptor getImageDescriptor(TreePath elementPath, IPresentationContext presentationContext, String columnId) throws CoreException { - if (columnId == null || VariableColumnPresentation.COLUMN_VARIABLE_NAME.equals(columnId)) { + if (columnId == null || IDebugUIConstants.COLUMN_ID_VARIABLE_NAME.equals(columnId)) { return super.getImageDescriptor(elementPath, presentationContext, columnId); } return null; @@ -36,7 +36,7 @@ public class RegisterGroupLabelProvider extends DebugElementLabelProvider { * @see org.eclipse.debug.internal.ui.model.elements.DebugElementLabelProvider#getLabel(org.eclipse.jface.viewers.TreePath, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, java.lang.String) */ protected String getLabel(TreePath elementPath, IPresentationContext context, String columnId) throws CoreException { - if (columnId == null || VariableColumnPresentation.COLUMN_VARIABLE_NAME.equals(columnId)) { + if (columnId == null || IDebugUIConstants.COLUMN_ID_VARIABLE_NAME.equals(columnId)) { return super.getLabel(elementPath, context, columnId); } else { return IInternalDebugCoreConstants.EMPTY_STRING; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/VariableLabelProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/VariableLabelProvider.java index d73f15e9e..3aed4003b 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/VariableLabelProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/VariableLabelProvider.java @@ -15,7 +15,6 @@ import org.eclipse.debug.core.model.IValue; import org.eclipse.debug.core.model.IVariable; import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.internal.ui.DefaultLabelProvider; -import org.eclipse.debug.internal.ui.elements.adapters.VariableColumnPresentation; import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext; import org.eclipse.debug.ui.IDebugUIConstants; import org.eclipse.jface.resource.ImageDescriptor; @@ -67,7 +66,7 @@ public class VariableLabelProvider extends DebugElementLabelProvider { * @see org.eclipse.debug.internal.ui.model.elements.DebugElementLabelProvider#getImageDescriptor(org.eclipse.jface.viewers.TreePath, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, java.lang.String) */ protected ImageDescriptor getImageDescriptor(TreePath elementPath, IPresentationContext presentationContext, String columnId) throws CoreException { - if (columnId == null || VariableColumnPresentation.COLUMN_VARIABLE_NAME.equals(columnId)) { + if (columnId == null || IDebugUIConstants.COLUMN_ID_VARIABLE_NAME.equals(columnId)) { return super.getImageDescriptor(elementPath, presentationContext, columnId); } return null; @@ -101,16 +100,16 @@ public class VariableLabelProvider extends DebugElementLabelProvider { * @param context presentation context specifying how to display the text * @param columnId the column to get the text for * @return the label text - * @throws CoreException + * @throws CoreException Error while retrieving data from model. */ protected String getColumnText(IVariable variable, IValue value, IPresentationContext context, String columnId) throws CoreException { - if (VariableColumnPresentation.COLUMN_VARIABLE_NAME.equals(columnId)) { + if (IDebugUIConstants.COLUMN_ID_VARIABLE_NAME.equals(columnId)) { return getVariableName(variable, context); - } else if (VariableColumnPresentation.COLUMN_VARIABLE_TYPE.equals(columnId)) { + } else if (IDebugUIConstants.COLUMN_ID_VARIABLE_TYPE.equals(columnId)) { return getVariableTypeName(variable, context); - } else if (VariableColumnPresentation.COLUMN_VARIABLE_VALUE.equals(columnId)) { + } else if (IDebugUIConstants.COLUMN_ID_VARIABLE_VALUE.equals(columnId)) { return getValueText(variable, value, context); - } else if (VariableColumnPresentation.COLUMN_VALUE_TYPE.equals(columnId)) { + } else if (IDebugUIConstants.COLUMN_ID_VARIABLE_VALUE_TYPE.equals(columnId)) { return getValueTypeName(variable, value, context); } return null; @@ -119,10 +118,10 @@ public class VariableLabelProvider extends DebugElementLabelProvider { /** * Returns the name of the given variable to display in <code>COLUMN_VARIABLE_NAME</code>. * - * @param variable - * @param context + * @param variable Variable to get the name for. + * @param context View context. * @return variable name - * @throws CoreException + * @throws CoreException Error while retrieving data from model. */ protected String getVariableName(IVariable variable, IPresentationContext context) throws CoreException { return variable.getName(); @@ -131,10 +130,10 @@ public class VariableLabelProvider extends DebugElementLabelProvider { /** * Returns the type name of the given variable to display in <code>COLUMN_VARIABLE_TYPE</code>. * - * @param variable - * @param context + * @param variable Variable to get the type for. + * @param context View context. * @return variable type name - * @throws CoreException + * @throws CoreException Error while retrieving data from model. */ protected String getVariableTypeName(IVariable variable, IPresentationContext context) throws CoreException { return variable.getReferenceTypeName(); @@ -143,11 +142,11 @@ public class VariableLabelProvider extends DebugElementLabelProvider { /** * Returns the label for the given value's type to display in <code>COLUMN_VARIABLE_VALUE</code> * - * @param variable - * @param value - * @param context + * @param variable Variable to get the value type for. + * @param value Variable value to get type label for. + * @param context View context. * @return value label - * @throws CoreException + * @throws CoreException Error while retrieving data from model. */ protected String getValueTypeName(IVariable variable, IValue value, IPresentationContext context) throws CoreException { return value.getReferenceTypeName(); @@ -156,11 +155,11 @@ public class VariableLabelProvider extends DebugElementLabelProvider { /** * Returns the label for the given value to display in <code>COLUMN_VALUE_TYPE</code> * - * @param variable - * @param value - * @param context + * @param variable Variable to get the value for. + * @param value Variable value to get value label for. + * @param context View context. * @return value label - * @throws CoreException + * @throws CoreException Error while retrieving data from model. */ protected String getValueText(IVariable variable, IValue value, IPresentationContext context) throws CoreException { return escapeSpecialChars(value.getValueString()); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualCopyToClipboardActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualCopyToClipboardActionDelegate.java index 34b7ca92d..cbe876009 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualCopyToClipboardActionDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualCopyToClipboardActionDelegate.java @@ -23,7 +23,6 @@ import org.eclipse.debug.internal.core.IInternalDebugCoreConstants; import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.internal.ui.actions.AbstractDebugActionDelegate; import org.eclipse.debug.internal.ui.actions.ActionMessages; -import org.eclipse.debug.internal.ui.elements.adapters.VariableColumnPresentation; import org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenUpdate; import org.eclipse.debug.internal.ui.viewers.model.provisional.ILabelUpdate; import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta; @@ -38,6 +37,7 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.TreeModelViewer; import org.eclipse.debug.internal.ui.viewers.model.provisional.VirtualItem; import org.eclipse.debug.internal.ui.viewers.model.provisional.VirtualItem.Index; import org.eclipse.debug.internal.ui.viewers.model.provisional.VirtualTreeModelViewer; +import org.eclipse.debug.ui.IDebugUIConstants; import org.eclipse.debug.ui.IDebugView; import org.eclipse.jface.action.IAction; import org.eclipse.jface.dialogs.MessageDialog; @@ -185,8 +185,8 @@ public class VirtualCopyToClipboardActionDelegate extends AbstractDebugActionDel // Try to find the name column. for (int i = 0; i < clientColumns.length; i++) { - if (VariableColumnPresentation.COLUMN_VARIABLE_NAME.equals(clientColumns[i])) { - return new String[] { VariableColumnPresentation.COLUMN_VARIABLE_NAME }; + if (IDebugUIConstants.COLUMN_ID_VARIABLE_NAME.equals(clientColumns[i])) { + return new String[] { IDebugUIConstants.COLUMN_ID_VARIABLE_NAME }; } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualFindAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualFindAction.java index 8ea5d02d8..08fc6ee63 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualFindAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualFindAction.java @@ -24,7 +24,6 @@ import org.eclipse.core.runtime.Status; import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.internal.ui.IDebugHelpContextIds; import org.eclipse.debug.internal.ui.actions.ActionMessages; -import org.eclipse.debug.internal.ui.elements.adapters.VariableColumnPresentation; import org.eclipse.debug.internal.ui.viewers.FindElementDialog; import org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenUpdate; import org.eclipse.debug.internal.ui.viewers.model.provisional.ILabelUpdate; @@ -38,6 +37,7 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.PresentationConte import org.eclipse.debug.internal.ui.viewers.model.provisional.TreeModelViewer; import org.eclipse.debug.internal.ui.viewers.model.provisional.VirtualItem; import org.eclipse.debug.internal.ui.viewers.model.provisional.VirtualTreeModelViewer; +import org.eclipse.debug.ui.IDebugUIConstants; import org.eclipse.jface.action.Action; import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.operation.IRunnableWithProgress; @@ -190,8 +190,8 @@ public class VirtualFindAction extends Action implements IUpdate { // Try to find the name column. for (int i = 0; i < clientColumns.length; i++) { - if (VariableColumnPresentation.COLUMN_VARIABLE_NAME.equals(clientColumns[i])) { - return new String[] { VariableColumnPresentation.COLUMN_VARIABLE_NAME }; + if (IDebugUIConstants.COLUMN_ID_VARIABLE_NAME.equals(clientColumns[i])) { + return new String[] { IDebugUIConstants.COLUMN_ID_VARIABLE_NAME }; } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDebugUIConstants.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDebugUIConstants.java index 7cdd455ea..e7de3e0b8 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDebugUIConstants.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDebugUIConstants.java @@ -1280,4 +1280,41 @@ public interface IDebugUIConstants { * @since 3.5 */ public static final String DEBUG_CONTEXT_SOURCE_NAME = "debugContext"; //$NON-NLS-1$ + + + /** + * ID for the default column layout for the variables, expressions + * and registers views. + * + * @since 3.8 + */ + public final static String COLUMN_PRESENTATION_ID_VARIABLE = IDebugUIConstants.PLUGIN_ID + ".VARIALBE_COLUMN_PRESENTATION"; //$NON-NLS-1$ + + /** + * Default ID for the "Name" column in the Variables views. + * + * @since 3.8 + */ + public final static String COLUMN_ID_VARIABLE_NAME = COLUMN_PRESENTATION_ID_VARIABLE + ".COL_VAR_NAME"; //$NON-NLS-1$ + + /** + * Default ID for the "Declared Type" column in the Variables views. + * + * @since 3.8 + */ + public final static String COLUMN_ID_VARIABLE_TYPE = COLUMN_PRESENTATION_ID_VARIABLE + ".COL_VAR_TYPE"; //$NON-NLS-1$ + + /** + * Default ID for the "Value" column in the Variables views. + * + * @since 3.8 + */ + public final static String COLUMN_ID_VARIABLE_VALUE = COLUMN_PRESENTATION_ID_VARIABLE + ".COL_VAR_VALUE"; //$NON-NLS-1$ + + /** + * Default ID for the "Actual Type" column in the Variables views. + * + * @since 3.8 + */ + public final static String COLUMN_ID_VARIABLE_VALUE_TYPE = COLUMN_PRESENTATION_ID_VARIABLE + ".COL_VALUE_TYPE"; //$NON-NLS-1$ } |