mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-30 12:25:35 +02:00
[268233] - Dependencies on internal constants cause the CDT build to fail against 3.5M6 platform.
This commit is contained in:
parent
85c91a8433
commit
1681e9fc13
8 changed files with 34 additions and 40 deletions
|
@ -16,7 +16,6 @@ import org.eclipse.cdt.debug.internal.ui.CDebugUIUtils;
|
|||
import org.eclipse.core.runtime.CoreException;
|
||||
import org.eclipse.debug.core.model.IValue;
|
||||
import org.eclipse.debug.core.model.IVariable;
|
||||
import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
|
||||
import org.eclipse.debug.internal.ui.elements.adapters.VariableColumnPresentation;
|
||||
import org.eclipse.debug.internal.ui.model.elements.DebugElementLabelProvider;
|
||||
import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;
|
||||
|
@ -98,7 +97,7 @@ public class CVariableLabelProvider extends DebugElementLabelProvider {
|
|||
IVariable variable = (IVariable)element;
|
||||
if ( variable.hasValueChanged() ) {
|
||||
// No public access to the changed value background color of the Variables view. See https://bugs.eclipse.org/bugs/show_bug.cgi?id=187509
|
||||
return DebugUITools.getPreferenceColor( IInternalDebugUIConstants.PREF_CHANGED_VALUE_BACKGROUND ).getRGB();
|
||||
return DebugUITools.getPreferenceColor( IDebugUIConstants.PREF_CHANGED_VALUE_BACKGROUND ).getRGB();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -110,7 +109,7 @@ public class CVariableLabelProvider extends DebugElementLabelProvider {
|
|||
*/
|
||||
protected FontData getFontData( TreePath elementPath, IPresentationContext presentationContext, String columnId ) throws CoreException {
|
||||
// No public access to the Variables view text font id. See https://bugs.eclipse.org/bugs/show_bug.cgi?id=187509
|
||||
return JFaceResources.getFontDescriptor( IInternalDebugUIConstants.VARIABLE_TEXT_FONT ).getFontData()[0];
|
||||
return JFaceResources.getFontDescriptor( IDebugUIConstants.PREF_VARIABLE_TEXT_FONT ).getFontData()[0];
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
|
|
|
@ -25,7 +25,6 @@ import org.eclipse.cdt.dsf.ui.viewmodel.VMDelta;
|
|||
import org.eclipse.debug.core.DebugPlugin;
|
||||
import org.eclipse.debug.core.IExpressionManager;
|
||||
import org.eclipse.debug.core.model.IExpression;
|
||||
import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
|
||||
import org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenCountUpdate;
|
||||
import org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenUpdate;
|
||||
import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementEditor;
|
||||
|
@ -34,6 +33,7 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.IHasChildrenUpdat
|
|||
import org.eclipse.debug.internal.ui.viewers.model.provisional.ILabelUpdate;
|
||||
import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta;
|
||||
import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;
|
||||
import org.eclipse.debug.ui.IDebugUIConstants;
|
||||
import org.eclipse.jface.resource.JFaceResources;
|
||||
import org.eclipse.jface.viewers.CellEditor;
|
||||
import org.eclipse.jface.viewers.ICellModifier;
|
||||
|
@ -213,7 +213,7 @@ public class ExpressionManagerVMNode extends AbstractVMNode
|
|||
for (int i = 0; i < columnIds.length; i++) {
|
||||
if (IDebugVMConstants.COLUMN_ID__EXPRESSION.equals(columnIds[i])) {
|
||||
update.setLabel(MessagesForExpressionVM.ExpressionManagerLayoutNode__newExpression_label, i);
|
||||
update.setFontData(JFaceResources.getFontDescriptor(IInternalDebugUIConstants.VARIABLE_TEXT_FONT).getFontData()[0], i);
|
||||
update.setFontData(JFaceResources.getFontDescriptor(IDebugUIConstants.PREF_VARIABLE_TEXT_FONT).getFontData()[0], i);
|
||||
} else {
|
||||
update.setLabel("", i); //$NON-NLS-1$
|
||||
}
|
||||
|
|
|
@ -4,7 +4,6 @@ import org.eclipse.cdt.dsf.debug.ui.viewmodel.IDebugVMConstants;
|
|||
import org.eclipse.cdt.dsf.ui.viewmodel.AbstractVMContext;
|
||||
import org.eclipse.cdt.dsf.ui.viewmodel.IVMNode;
|
||||
import org.eclipse.debug.core.model.IExpression;
|
||||
import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
|
||||
import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementLabelProvider;
|
||||
import org.eclipse.debug.internal.ui.viewers.model.provisional.ILabelUpdate;
|
||||
import org.eclipse.debug.ui.DebugUITools;
|
||||
|
@ -77,7 +76,7 @@ public class InvalidExpressionVMContext extends AbstractVMContext implements IEl
|
|||
} else {
|
||||
update.setLabel("", i); //$NON-NLS-1$
|
||||
}
|
||||
update.setFontData(JFaceResources.getFontDescriptor(IInternalDebugUIConstants.VARIABLE_TEXT_FONT).getFontData()[0], i);
|
||||
update.setFontData(JFaceResources.getFontDescriptor(IDebugUIConstants.PREF_VARIABLE_TEXT_FONT).getFontData()[0], i);
|
||||
}
|
||||
|
||||
update.done();
|
||||
|
|
|
@ -39,11 +39,11 @@ import org.eclipse.cdt.dsf.ui.viewmodel.properties.LabelFont;
|
|||
import org.eclipse.cdt.dsf.ui.viewmodel.properties.LabelText;
|
||||
import org.eclipse.cdt.dsf.ui.viewmodel.properties.PropertiesBasedLabelProvider;
|
||||
import org.eclipse.core.runtime.IStatus;
|
||||
import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
|
||||
import org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenUpdate;
|
||||
import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementLabelProvider;
|
||||
import org.eclipse.debug.internal.ui.viewers.model.provisional.ILabelUpdate;
|
||||
import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta;
|
||||
import org.eclipse.debug.ui.IDebugUIConstants;
|
||||
import org.eclipse.jface.resource.JFaceResources;
|
||||
|
||||
/**
|
||||
|
@ -103,7 +103,7 @@ public class ModulesVMNode extends AbstractDMVMNode
|
|||
};
|
||||
},
|
||||
new DsfUILabelImage(IDsfDebugUIConstants.IMG_OBJS_SHARED_LIBRARY_SYMBOLS_UNLOADED),
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IInternalDebugUIConstants.VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IDebugUIConstants.PREF_VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
}));
|
||||
|
||||
return provider;
|
||||
|
|
|
@ -61,7 +61,6 @@ import org.eclipse.core.runtime.IStatus;
|
|||
import org.eclipse.core.runtime.Status;
|
||||
import org.eclipse.debug.core.DebugPlugin;
|
||||
import org.eclipse.debug.core.model.IExpression;
|
||||
import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
|
||||
import org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenUpdate;
|
||||
import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementCompareRequest;
|
||||
import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementEditor;
|
||||
|
@ -197,7 +196,7 @@ public class RegisterBitFieldVMNode extends AbstractExpressionVMNode
|
|||
MessagesForRegisterVM.RegisterBitFieldVMNode_Name_column__text_format,
|
||||
new String[] { PROP_NAME }),
|
||||
new LabelImage(DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_OBJS_REGISTER)),
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IInternalDebugUIConstants.VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IDebugUIConstants.PREF_VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
}));
|
||||
|
||||
// The description column contains a brief description of the bit field.
|
||||
|
@ -207,7 +206,7 @@ public class RegisterBitFieldVMNode extends AbstractExpressionVMNode
|
|||
new LabelText(
|
||||
MessagesForRegisterVM.RegisterBitFieldVMNode_Description_column__text_format,
|
||||
new String[] { IRegisterVMConstants.PROP_DESCRIPTION }),
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IInternalDebugUIConstants.VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IDebugUIConstants.PREF_VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
}));
|
||||
|
||||
// In the type column add information about bit field read/write/fload flags.
|
||||
|
@ -246,7 +245,7 @@ public class RegisterBitFieldVMNode extends AbstractExpressionVMNode
|
|||
}
|
||||
}
|
||||
},
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IInternalDebugUIConstants.VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IDebugUIConstants.PREF_VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
}));
|
||||
|
||||
// Value column shows the value in the active value format, followed by the active mnemonic if one is
|
||||
|
@ -278,7 +277,7 @@ public class RegisterBitFieldVMNode extends AbstractExpressionVMNode
|
|||
},
|
||||
new LabelColor(
|
||||
null,
|
||||
DebugUITools.getPreferenceColor(IInternalDebugUIConstants.PREF_CHANGED_VALUE_BACKGROUND).getRGB())
|
||||
DebugUITools.getPreferenceColor(IDebugUIConstants.PREF_CHANGED_VALUE_BACKGROUND).getRGB())
|
||||
{
|
||||
{
|
||||
setPropertyNames(new String[] {
|
||||
|
@ -297,7 +296,7 @@ public class RegisterBitFieldVMNode extends AbstractExpressionVMNode
|
|||
return Boolean.TRUE.equals(activeChanged) && !Boolean.TRUE.equals(activeFormatChanged);
|
||||
}
|
||||
},
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IInternalDebugUIConstants.VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IDebugUIConstants.PREF_VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
}));
|
||||
|
||||
// Expression column is visible only in the expressions view. It shows the expression string that the user
|
||||
|
@ -309,7 +308,7 @@ public class RegisterBitFieldVMNode extends AbstractExpressionVMNode
|
|||
MessagesForRegisterVM.RegisterBitFieldVMNode_Expression_column__text_format,
|
||||
new String[] { PROP_ELEMENT_EXPRESSION }),
|
||||
new LabelImage(DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_OBJS_REGISTER)),
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IInternalDebugUIConstants.VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IDebugUIConstants.PREF_VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
}));
|
||||
|
||||
provider.setColumnInfo(
|
||||
|
@ -351,7 +350,7 @@ public class RegisterBitFieldVMNode extends AbstractExpressionVMNode
|
|||
return Boolean.TRUE.equals(activeChanged) && !Boolean.TRUE.equals(activeFormatChanged);
|
||||
}
|
||||
},
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IInternalDebugUIConstants.VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IDebugUIConstants.PREF_VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
}));
|
||||
|
||||
return provider;
|
||||
|
|
|
@ -48,7 +48,6 @@ import org.eclipse.core.runtime.IStatus;
|
|||
import org.eclipse.core.runtime.Status;
|
||||
import org.eclipse.debug.core.DebugPlugin;
|
||||
import org.eclipse.debug.core.model.IExpression;
|
||||
import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
|
||||
import org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenUpdate;
|
||||
import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementCompareRequest;
|
||||
import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementEditor;
|
||||
|
@ -223,7 +222,7 @@ public class RegisterGroupVMNode extends AbstractExpressionVMNode
|
|||
MessagesForRegisterVM.RegisterGroupVMNode_Name_column__text_format,
|
||||
new String[] { PROP_NAME }),
|
||||
new LabelImage(DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_OBJS_REGISTER_GROUP)),
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IInternalDebugUIConstants.VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IDebugUIConstants.PREF_VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
}));
|
||||
|
||||
// The description column contains a brief description of the register group.
|
||||
|
@ -232,7 +231,7 @@ public class RegisterGroupVMNode extends AbstractExpressionVMNode
|
|||
new LabelColumnInfo(new LabelAttribute[] {
|
||||
new LabelText(MessagesForRegisterVM.RegisterGroupVMNode_Description_column__text_format,
|
||||
new String[] { PROP_REGISTER_GROUP_DESCRIPTION }),
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IInternalDebugUIConstants.VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IDebugUIConstants.PREF_VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
}));
|
||||
|
||||
// Expression column is visible only in the expressions view. It shows the expression string that the user
|
||||
|
@ -244,7 +243,7 @@ public class RegisterGroupVMNode extends AbstractExpressionVMNode
|
|||
MessagesForRegisterVM.RegisterGroupVMNode_Expression_column__text_format,
|
||||
new String[] { PROP_ELEMENT_EXPRESSION }),
|
||||
new LabelImage(DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_OBJS_REGISTER_GROUP)),
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IInternalDebugUIConstants.VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IDebugUIConstants.PREF_VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
}));
|
||||
|
||||
provider.setColumnInfo(
|
||||
|
@ -253,7 +252,7 @@ public class RegisterGroupVMNode extends AbstractExpressionVMNode
|
|||
new LabelText(MessagesForRegisterVM.RegisterGroupVMNode_No_columns__text_format,
|
||||
new String[] { PROP_NAME, PROP_REGISTER_GROUP_DESCRIPTION}),
|
||||
new LabelImage(DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_OBJS_REGISTER_GROUP)),
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IInternalDebugUIConstants.VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IDebugUIConstants.PREF_VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
}));
|
||||
|
||||
return provider;
|
||||
|
|
|
@ -57,7 +57,6 @@ import org.eclipse.core.runtime.IStatus;
|
|||
import org.eclipse.core.runtime.Status;
|
||||
import org.eclipse.debug.core.DebugPlugin;
|
||||
import org.eclipse.debug.core.model.IExpression;
|
||||
import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
|
||||
import org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenUpdate;
|
||||
import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementCompareRequest;
|
||||
import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementEditor;
|
||||
|
@ -188,7 +187,7 @@ public class RegisterVMNode extends AbstractExpressionVMNode
|
|||
MessagesForRegisterVM.RegisterVMNode_Name_column__text_format,
|
||||
new String[] { PROP_NAME }),
|
||||
new LabelImage(DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_OBJS_REGISTER)),
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IInternalDebugUIConstants.VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IDebugUIConstants.PREF_VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
}));
|
||||
|
||||
// The description column contains a brief description of the register.
|
||||
|
@ -198,7 +197,7 @@ public class RegisterVMNode extends AbstractExpressionVMNode
|
|||
new LabelText(
|
||||
MessagesForRegisterVM.RegisterVMNode_Description_column__text_format,
|
||||
new String[] { IRegisterVMConstants.PROP_DESCRIPTION }),
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IInternalDebugUIConstants.VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IDebugUIConstants.PREF_VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
}));
|
||||
|
||||
// In the type column add information about register read/write/fload flags.
|
||||
|
@ -242,7 +241,7 @@ public class RegisterVMNode extends AbstractExpressionVMNode
|
|||
}
|
||||
}
|
||||
},
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IInternalDebugUIConstants.VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IDebugUIConstants.PREF_VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
}));
|
||||
|
||||
// Value column shows the value in the active value format.
|
||||
|
@ -268,7 +267,7 @@ public class RegisterVMNode extends AbstractExpressionVMNode
|
|||
},
|
||||
new LabelColor(
|
||||
null,
|
||||
DebugUITools.getPreferenceColor(IInternalDebugUIConstants.PREF_CHANGED_VALUE_BACKGROUND).getRGB())
|
||||
DebugUITools.getPreferenceColor(IDebugUIConstants.PREF_CHANGED_VALUE_BACKGROUND).getRGB())
|
||||
{
|
||||
{
|
||||
setPropertyNames(new String[] {
|
||||
|
@ -287,7 +286,7 @@ public class RegisterVMNode extends AbstractExpressionVMNode
|
|||
return Boolean.TRUE.equals(activeChanged) && !Boolean.TRUE.equals(activeFormatChanged);
|
||||
}
|
||||
},
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IInternalDebugUIConstants.VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IDebugUIConstants.PREF_VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
}));
|
||||
|
||||
// Expression column is visible only in the expressions view. It shows the expression string that the user
|
||||
|
@ -299,7 +298,7 @@ public class RegisterVMNode extends AbstractExpressionVMNode
|
|||
MessagesForRegisterVM.RegisterVMNode_Expression_column__text_format,
|
||||
new String[] { PROP_ELEMENT_EXPRESSION }),
|
||||
new LabelImage(DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_OBJS_REGISTER)),
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IInternalDebugUIConstants.VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IDebugUIConstants.PREF_VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
}));
|
||||
|
||||
provider.setColumnInfo(
|
||||
|
@ -333,7 +332,7 @@ public class RegisterVMNode extends AbstractExpressionVMNode
|
|||
return Boolean.TRUE.equals(activeChanged) && !Boolean.TRUE.equals(activeFormatChanged);
|
||||
}
|
||||
},
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IInternalDebugUIConstants.VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IDebugUIConstants.PREF_VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
}));
|
||||
|
||||
return provider;
|
||||
|
|
|
@ -70,7 +70,6 @@ import org.eclipse.core.runtime.IStatus;
|
|||
import org.eclipse.core.runtime.Status;
|
||||
import org.eclipse.debug.core.DebugPlugin;
|
||||
import org.eclipse.debug.core.model.IExpression;
|
||||
import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
|
||||
import org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenUpdate;
|
||||
import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementCompareRequest;
|
||||
import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementEditor;
|
||||
|
@ -256,7 +255,7 @@ public class VariableVMNode extends AbstractExpressionVMNode
|
|||
pointerLabelImage,
|
||||
aggregateLabelImage,
|
||||
simpleLabelImage,
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IInternalDebugUIConstants.VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IDebugUIConstants.PREF_VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
}));
|
||||
|
||||
// Expression column is visible only in the expressions view. It shows the expression string that the user
|
||||
|
@ -270,7 +269,7 @@ public class VariableVMNode extends AbstractExpressionVMNode
|
|||
pointerLabelImage,
|
||||
aggregateLabelImage,
|
||||
simpleLabelImage,
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IInternalDebugUIConstants.VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IDebugUIConstants.PREF_VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
}));
|
||||
|
||||
// Type column only contains the type name.
|
||||
|
@ -281,7 +280,7 @@ public class VariableVMNode extends AbstractExpressionVMNode
|
|||
MessagesForVariablesVM.VariableVMNode_Type_column__text_format,
|
||||
new String[] { PROP_VARIABLE_TYPE_NAME }),
|
||||
new LabelText( MessagesForVariablesVM.VariableVMNode_Type_column__Error__text_format, new String[] {}),
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IInternalDebugUIConstants.VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IDebugUIConstants.PREF_VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
}));
|
||||
|
||||
// Value column is more complicated:
|
||||
|
@ -332,7 +331,7 @@ public class VariableVMNode extends AbstractExpressionVMNode
|
|||
//
|
||||
new LabelColor(
|
||||
null,
|
||||
DebugUITools.getPreferenceColor(IInternalDebugUIConstants.PREF_CHANGED_VALUE_BACKGROUND).getRGB())
|
||||
DebugUITools.getPreferenceColor(IDebugUIConstants.PREF_CHANGED_VALUE_BACKGROUND).getRGB())
|
||||
{
|
||||
{
|
||||
setPropertyNames(new String[] {
|
||||
|
@ -356,7 +355,7 @@ public class VariableVMNode extends AbstractExpressionVMNode
|
|||
( Boolean.TRUE.equals(activeChanged) && !Boolean.TRUE.equals(activeFormatChanged));
|
||||
};
|
||||
},
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IInternalDebugUIConstants.VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IDebugUIConstants.PREF_VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
}));
|
||||
|
||||
// Address column shows the variable's address. It is highlighted with the change background color when the
|
||||
|
@ -370,7 +369,7 @@ public class VariableVMNode extends AbstractExpressionVMNode
|
|||
new LabelText(MessagesForVariablesVM.VariableVMNode_Address_column__Error__text_format, new String[] {}),
|
||||
new LabelColor(
|
||||
null,
|
||||
DebugUITools.getPreferenceColor(IInternalDebugUIConstants.PREF_CHANGED_VALUE_BACKGROUND).getRGB())
|
||||
DebugUITools.getPreferenceColor(IDebugUIConstants.PREF_CHANGED_VALUE_BACKGROUND).getRGB())
|
||||
{
|
||||
{ setPropertyNames(new String[] { PROP_VARIABLE_ADDRESS, PROP_VARIABLE_ADDRESS_CHANGED}); }
|
||||
|
||||
|
@ -380,7 +379,7 @@ public class VariableVMNode extends AbstractExpressionVMNode
|
|||
return Boolean.TRUE.equals(changed);
|
||||
};
|
||||
},
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IInternalDebugUIConstants.VARIABLE_TEXT_FONT).getFontData()[0]),
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IDebugUIConstants.PREF_VARIABLE_TEXT_FONT).getFontData()[0]),
|
||||
}));
|
||||
|
||||
// Description column is shown in the expression view, but is not supported for variables.
|
||||
|
@ -390,7 +389,7 @@ public class VariableVMNode extends AbstractExpressionVMNode
|
|||
new LabelColumnInfo(new LabelAttribute[] {
|
||||
new LabelText(MessagesForVariablesVM.VariableVMNode_Description_column__text_format, new String[] {}) {
|
||||
},
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IInternalDebugUIConstants.VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IDebugUIConstants.PREF_VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
}));
|
||||
|
||||
// Configure the case where there are no columns visible. It basically combines the name and the value columns only.
|
||||
|
@ -463,7 +462,7 @@ public class VariableVMNode extends AbstractExpressionVMNode
|
|||
return Boolean.TRUE.equals(stringChanged) || Boolean.TRUE.equals(activeChanged);
|
||||
};
|
||||
},
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IInternalDebugUIConstants.VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
new LabelFont(JFaceResources.getFontDescriptor(IDebugUIConstants.PREF_VARIABLE_TEXT_FONT).getFontData()[0])
|
||||
}));
|
||||
|
||||
return provider;
|
||||
|
|
Loading…
Add table
Reference in a new issue