rm) {
rm.setData(false);
rm.done();
}
+ /**
+ * Sets the given expression as the expression belonging to the given
+ * element.
+ *
+ * This base class creates VM context elements using the extending class's
+ * {@link #update(IChildrenUpdate[])} method. The element matching the
+ * expression is found using {@link #testElementForExpression(Object, IExpression, DataRequestMonitor)}.
+ * Once the matching element is found it needs to be linked to the expression
+ * so that it can be distinguished from other contexts created for identical
+ * but distinct expressions. This method accomplishes this task. Elements
+ * which are associated with expressions should use the expression object
+ * for implementation of {@link #equals(Object)} and {@link #hashCode()}
+ * methods.
+ *
+ *
+ * @param element
+ * @param expression
+ */
protected void associateExpression(Object element, IExpression expression) {
}
-
+
+ /**
+ * Create a place holder for an invalid expression. If for a given expression,
+ * this VM node returns true from {@link #canParseExpression(IExpression)}, which
+ * indicates that the expression matches the node's expected format, but the node
+ * then is not able to find the element represented by the expression, then an
+ * "invalid" expression context needs to be created.
+ *
+ * This method can be overriden to provide a node-specific invalid expression
+ * context.
+ *
+ *
+ * @param expression Expression to create the context for.
+ * @return Returns a VM context object representing an invalid expression with
+ *
+ * @since 1.1
+ */
+ protected IVMContext createInvalidExpressionVMContext(IExpression expression) {
+ return new InvalidExpressionVMContext(this, expression);
+ }
}
diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/expression/ExpressionManagerVMNode.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/expression/ExpressionManagerVMNode.java
index 986e8cf4c8f..fae5b8353db 100644
--- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/expression/ExpressionManagerVMNode.java
+++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/expression/ExpressionManagerVMNode.java
@@ -34,8 +34,6 @@ 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.DebugUITools;
-import org.eclipse.debug.ui.IDebugUIConstants;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.jface.viewers.ICellModifier;
@@ -61,46 +59,6 @@ import org.eclipse.swt.widgets.Composite;
public class ExpressionManagerVMNode extends AbstractVMNode
implements IElementLabelProvider, IElementEditor
{
-
- /**
- * VMC of an expression object that failed to get parsed by any of the
- * configured expression layout nodes. It is only used to display an
- * error message in the view, and to allow the user to edit the
- * expression.
- */
- static class InvalidExpressionVMContext extends AbstractVMContext {
- final private IExpression fExpression;
-
- public InvalidExpressionVMContext(ExpressionManagerVMNode node, IExpression expression) {
- super(node);
- fExpression = expression;
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public Object getAdapter(Class adapter) {
- if (adapter.isAssignableFrom(fExpression.getClass())) {
- return fExpression;
- } else {
- return super.getAdapter(adapter);
- }
- }
-
- public IExpression getExpression() {
- return fExpression;
- }
-
- @Override
- public boolean equals(Object obj) {
- return obj instanceof InvalidExpressionVMContext && ((InvalidExpressionVMContext)obj).fExpression.equals(fExpression);
- }
-
- @Override
- public int hashCode() {
- return fExpression.hashCode();
- }
- }
-
/**
* VMC for a new expression object to be added. When user clicks on this node to
* edit it, he will create a new expression.
@@ -237,9 +195,7 @@ public class ExpressionManagerVMNode extends AbstractVMNode
// The expression layout nodes are responsible for supplying label providers
// for their VMCs.
for (ILabelUpdate update : updates) {
- if (update.getElement() instanceof InvalidExpressionVMContext) {
- updateInvalidExpressionVMCLabel(update, (InvalidExpressionVMContext) update.getElement());
- } else if (update.getElement() instanceof NewExpressionVMC) {
+ if (update.getElement() instanceof NewExpressionVMC) {
updateNewExpressionVMCLabel(update, (NewExpressionVMC) update.getElement());
} else {
update.done();
@@ -247,33 +203,6 @@ public class ExpressionManagerVMNode extends AbstractVMNode
}
}
- /**
- * Updates the label for the InvalidExpressionVMC.
- */
- private void updateInvalidExpressionVMCLabel(ILabelUpdate update, InvalidExpressionVMContext vmc) {
- String[] columnIds = update.getColumnIds() != null ?
- update.getColumnIds() : new String[] { IDebugVMConstants.COLUMN_ID__NAME };
-
- for (int i = 0; i < columnIds.length; i++) {
- if (IDebugVMConstants.COLUMN_ID__EXPRESSION.equals(columnIds[i])) {
- update.setLabel(vmc.getExpression().getExpressionText(), i);
- update.setImageDescriptor(DebugUITools.getImageDescriptor( IDebugUIConstants.IMG_OBJS_EXPRESSION ), i);
- } else if (IDebugVMConstants.COLUMN_ID__NAME.equals(columnIds[i])) {
- update.setLabel(vmc.getExpression().getExpressionText(), i);
- update.setImageDescriptor(DebugUITools.getImageDescriptor( IDebugUIConstants.IMG_OBJS_EXPRESSION ), i);
- } else if (IDebugVMConstants.COLUMN_ID__VALUE.equals(columnIds[i])) {
- update.setLabel(MessagesForExpressionVM.ExpressionManagerLayoutNode__invalidExpression_valueColumn_label, i);
- } else {
- update.setLabel("", i); //$NON-NLS-1$
- }
- update.setFontData(JFaceResources.getFontDescriptor(IInternalDebugUIConstants.VARIABLE_TEXT_FONT).getFontData()[0], i);
- }
-
-
- update.done();
- }
-
-
/**
* Updates the label for the NewExpressionVMC.
*/
diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/expression/InvalidExpressionVMContext.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/expression/InvalidExpressionVMContext.java
new file mode 100644
index 00000000000..519548bd9e1
--- /dev/null
+++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/expression/InvalidExpressionVMContext.java
@@ -0,0 +1,88 @@
+package org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.expression;
+
+import org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.IDebugVMConstants;
+import org.eclipse.dd.dsf.ui.viewmodel.AbstractVMContext;
+import org.eclipse.dd.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;
+import org.eclipse.debug.ui.IDebugUIConstants;
+import org.eclipse.jface.resource.JFaceResources;
+
+/**
+ * VMC of an expression object that failed to get parsed by any of the
+ * configured expression layout nodes. It is only used to display an
+ * error message in the view, and to allow the user to edit the
+ * expression.
+ *
+ * Note: VM Nodes using this invalid expression VM context should
+ * provide a cell modifier to edit the expressions. The cell modifier
+ * should subclass {@link WatchExpressionCellModifier}.
+ *
+ *
+ * @since 1.1
+ */
+@SuppressWarnings("restriction")
+public class InvalidExpressionVMContext extends AbstractVMContext implements IElementLabelProvider {
+
+ final private IExpression fExpression;
+
+ public InvalidExpressionVMContext(IVMNode node, IExpression expression) {
+ super(node);
+ fExpression = expression;
+ }
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public Object getAdapter(Class adapter) {
+ if (adapter.isAssignableFrom(fExpression.getClass())) {
+ return fExpression;
+ } else {
+ return super.getAdapter(adapter);
+ }
+ }
+
+ public IExpression getExpression() {
+ return fExpression;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ return obj instanceof InvalidExpressionVMContext && ((InvalidExpressionVMContext)obj).fExpression.equals(fExpression);
+ }
+
+ @Override
+ public int hashCode() {
+ return fExpression.hashCode();
+ }
+
+ /**
+ * Updates the label for the InvalidExpressionVMC.
+ */
+ public void update(ILabelUpdate[] updates) {
+ for (ILabelUpdate update : updates) {
+ String[] columnIds = update.getColumnIds() != null ?
+ update.getColumnIds() : new String[] { IDebugVMConstants.COLUMN_ID__NAME };
+
+ for (int i = 0; i < columnIds.length; i++) {
+ if (IDebugVMConstants.COLUMN_ID__EXPRESSION.equals(columnIds[i])) {
+ update.setLabel(getExpression().getExpressionText(), i);
+ update.setImageDescriptor(DebugUITools.getImageDescriptor( IDebugUIConstants.IMG_OBJS_EXPRESSION ), i);
+ } else if (IDebugVMConstants.COLUMN_ID__NAME.equals(columnIds[i])) {
+ update.setLabel(getExpression().getExpressionText(), i);
+ update.setImageDescriptor(DebugUITools.getImageDescriptor( IDebugUIConstants.IMG_OBJS_EXPRESSION ), i);
+ } else if (IDebugVMConstants.COLUMN_ID__VALUE.equals(columnIds[i])) {
+ update.setLabel(MessagesForExpressionVM.ExpressionManagerLayoutNode__invalidExpression_valueColumn_label, i);
+ } else {
+ update.setLabel("", i); //$NON-NLS-1$
+ }
+ update.setFontData(JFaceResources.getFontDescriptor(IInternalDebugUIConstants.VARIABLE_TEXT_FONT).getFontData()[0], i);
+ }
+
+ update.done();
+ }
+ }
+
+}
\ No newline at end of file