Attachment #164265 for bug #308540

View | Details | Raw Unified | Return to bug 308540
Collapse All | Expand All

Lines 11-16 Link Here

(-)src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/GdbExpressionVMProvider.java (-1 / +6 lines)
11	package org.eclipse.cdt.dsf.gdb.internal.ui.viewmodel;	11	package org.eclipse.cdt.dsf.gdb.internal.ui.viewmodel;
12		12
13	import org.eclipse.cdt.dsf.debug.ui.IDsfDebugUIConstants;	13	import org.eclipse.cdt.dsf.debug.ui.IDsfDebugUIConstants;
		14	import org.eclipse.cdt.dsf.debug.ui.viewmodel.expression.DisabledExpressionVMNode;
14	import org.eclipse.cdt.dsf.debug.ui.viewmodel.expression.ExpressionManagerVMNode;	15	import org.eclipse.cdt.dsf.debug.ui.viewmodel.expression.ExpressionManagerVMNode;
15	import org.eclipse.cdt.dsf.debug.ui.viewmodel.expression.ExpressionVMProvider;	16	import org.eclipse.cdt.dsf.debug.ui.viewmodel.expression.ExpressionVMProvider;
16	import org.eclipse.cdt.dsf.debug.ui.viewmodel.expression.IExpressionVMNode;	17	import org.eclipse.cdt.dsf.debug.ui.viewmodel.expression.IExpressionVMNode;
Lines 72-77 Link Here
72	addChildNodes(rootNode, new IVMNode[] {expressionManagerNode});	73	addChildNodes(rootNode, new IVMNode[] {expressionManagerNode});
73	}	74	}
74		75
		76	// Disabled expression node intercepts disabled expressions and prevents them from being
		77	// evaluated by other nodes.
		78	IExpressionVMNode disabledExpressionNode = new DisabledExpressionVMNode(this);
		79
75	/*	80	/*
76	* The expression view wants to support fully all of the components of the register view.	81	* The expression view wants to support fully all of the components of the register view.
77	*/	82	*/
Lines 105-111 Link Here
105	* assume what it was passed was for it and the real node which wants to handle it would be	110	* assume what it was passed was for it and the real node which wants to handle it would be
106	* left out in the cold.	111	* left out in the cold.
107	*/	112	*/
108	setExpressionNodes(new IExpressionVMNode[] {registerGroupNode, variableNode});	113	setExpressionNodes(new IExpressionVMNode[] {disabledExpressionNode, registerGroupNode, variableNode});
109		114
110	/*	115	/*
111	* Let the work know which is the top level node.	116	* Let the work know which is the top level node.




/*******************************************************************************
 * Copyright (c) 2010 Wind River Systems and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *     Wind River Systems - initial API and implementation
 *******************************************************************************/
package org.eclipse.cdt.dsf.debug.ui.viewmodel.expression;

import java.text.MessageFormat;

import org.eclipse.cdt.dsf.concurrent.IDsfStatusConstants;
import org.eclipse.cdt.dsf.concurrent.RequestMonitor;
import org.eclipse.cdt.dsf.debug.ui.viewmodel.IDebugVMConstants;
import org.eclipse.cdt.dsf.internal.ui.DsfUIPlugin;
import org.eclipse.cdt.dsf.ui.viewmodel.AbstractVMNode;
import org.eclipse.cdt.dsf.ui.viewmodel.IVMNode;
import org.eclipse.cdt.dsf.ui.viewmodel.IVMProvider;
import org.eclipse.cdt.dsf.ui.viewmodel.VMDelta;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.debug.core.model.IExpression;
import org.eclipse.debug.core.model.IWatchExpression;
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;
import org.eclipse.debug.internal.ui.viewers.model.provisional.IHasChildrenUpdate;
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.internal.ui.viewers.model.provisional.IViewerUpdate;
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;
import org.eclipse.jface.viewers.TextCellEditor;
import org.eclipse.jface.viewers.TreePath;
import org.eclipse.swt.widgets.Composite;

/**
 * Expression VM Node which handles displaying disabled expressions.
 * 
 * @since 2.1
 */
public class DisabledExpressionVMNode extends AbstractVMNode 
    implements IExpressionVMNode, IElementEditor
{

    /** Cached reference to a cell modifier for editing expression strings of disabled expressions */
    private WatchExpressionCellModifier fWatchExpressionCellModifier = new WatchExpressionCellModifier();
    

    private static class DisabledExpressionVMContext extends InvalidExpressionVMContext {

        private static final MessageFormat NO_COLUMN_FORMAT = new MessageFormat(MessagesForExpressionVM.DisabledExpressionVMNode_disabled_no_columns); 

        DisabledExpressionVMContext(IVMNode node, IExpression expression) {
            super(node, expression);
        }
        
        /**
         * Updates the label for the DisabledExpressionVMNode.
         */
        @Override
        public void update(ILabelUpdate[] updates) {
            for (ILabelUpdate update : updates) {
                if (update.getColumnIds() == null) {
                    update.setLabel(NO_COLUMN_FORMAT.format( new Object[] { getExpression().getExpressionText() }), 0); 
                    update.setImageDescriptor(DebugUITools.getImageDescriptor( IDebugUIConstants.IMG_OBJS_EXPRESSION ), 0);
                } else {
                    String[] columnIds = update.getColumnIds();
                        
                    for (int i = 0; i < update.getColumnIds().length; i++) {
                        if (IDebugVMConstants.COLUMN_ID__EXPRESSION.equals(columnIds[i]) ||
                            IDebugVMConstants.COLUMN_ID__NAME.equals(columnIds[i])) 
                        {
                            update.setLabel(getExpression().getExpressionText(), i);
                            update.setImageDescriptor(DebugUITools.getImageDescriptor( IDebugUIConstants.IMG_OBJS_EXPRESSION ), i);
                        } else {
                            update.setLabel(MessagesForExpressionVM.DisabledExpressionVMNode_disabled_value, i);
                        }
                        update.setFontData(JFaceResources.getFontDescriptor(IDebugUIConstants.PREF_VARIABLE_TEXT_FONT).getFontData()[0], i);            
                    }
                }
                update.done();
            }
        }

    }
    
    public DisabledExpressionVMNode(IVMProvider provider) {
        super(provider);
    }
    
    public boolean canParseExpression(IExpression expression) {
        return expression instanceof IWatchExpression && !((IWatchExpression)expression).isEnabled();
    }

    public int getDeltaFlagsForExpression(IExpression expression, Object event) {
        return IModelDelta.NO_CHANGE;
    }

    public int getDeltaFlags(Object event) {
        return IModelDelta.NO_CHANGE;
    }

    public void buildDelta(Object event, VMDelta parent, int nodeOffset, RequestMonitor requestMonitor) {
        requestMonitor.done();
    }

    public void update(IChildrenCountUpdate[] updates) {
        for (IViewerUpdate update : updates) {
            update.setStatus(new Status(IStatus.ERROR, DsfUIPlugin.PLUGIN_ID, IDsfStatusConstants.NOT_SUPPORTED, "Not supported", null)); //$NON-NLS-1$
            update.done();
        }
    }

    public void update(IChildrenUpdate[] updates) {
        for (IViewerUpdate update : updates) {
            update.setStatus(new Status(IStatus.ERROR, DsfUIPlugin.PLUGIN_ID, IDsfStatusConstants.NOT_SUPPORTED, "Not supported", null)); //$NON-NLS-1$
            update.done();
        }
    }

    public void update(IHasChildrenUpdate[] updates) {
        for (IViewerUpdate update : updates) {
            update.setStatus(new Status(IStatus.ERROR, DsfUIPlugin.PLUGIN_ID, IDsfStatusConstants.NOT_SUPPORTED, "Not supported", null)); //$NON-NLS-1$
            update.done();
        }
    }

    public void update(IExpressionUpdate update) {
        update.setExpressionElement(new DisabledExpressionVMContext(this, update.getExpression()));
        update.done();
    }

    public void buildDeltaForExpression(IExpression expression, int elementIdx, Object event, VMDelta parentDelta, 
        TreePath path, RequestMonitor rm) 
    {
        rm.done();
    }

    public void buildDeltaForExpressionElement(Object element, int elementIdx, Object event, VMDelta parentDelta,
        RequestMonitor rm) {
        rm.done();
    }
    
    public CellEditor getCellEditor(IPresentationContext context, String columnId, Object element, Composite parent) {
        if (IDebugVMConstants.COLUMN_ID__EXPRESSION.equals(columnId)) {
            return new TextCellEditor(parent);
        } 
        return null;
    }
    
    public ICellModifier getCellModifier(IPresentationContext context, Object element) {
        return fWatchExpressionCellModifier;
    }

}

Lines 226-231 Link Here

(-)src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionVMProvider.java (-1 / +5 lines)
226	addChildNodes(rootNode, new IVMNode[] {expressionManagerNode});	226	addChildNodes(rootNode, new IVMNode[] {expressionManagerNode});
227	}	227	}
228		228
		229	// Disabled expression node intercepts disabled expressions and prevents them from being
		230	// evaluated by other nodes.
		231	IExpressionVMNode disabledExpressionNode = new DisabledExpressionVMNode(this);
		232
229	/*	233	/*
230	* The expression view wants to support fully all of the components of the register view.	234	* The expression view wants to support fully all of the components of the register view.
231	*/	235	*/
Lines 264-270 Link Here
264	* assume what it was passed was for it and the real node which wants to handle it would be	268	* assume what it was passed was for it and the real node which wants to handle it would be
265	* left out in the cold.	269	* left out in the cold.
266	*/	270	*/
267	setExpressionNodes(new IExpressionVMNode[] {registerGroupNode, variableNode});	271	setExpressionNodes(new IExpressionVMNode[] {disabledExpressionNode, registerGroupNode, variableNode});
268		272
269	/*	273	/*
270	* Let the work know which is the top level node.	274	* Let the work know which is the top level node.

Lines 30-35 Link Here

(-)src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/MessagesForExpressionVM.java (+3 lines)
30		30
31	public static String ExpressionManagerLayoutNode__newExpression_label;	31	public static String ExpressionManagerLayoutNode__newExpression_label;
32		32
		33	public static String DisabledExpressionVMNode_disabled_value;
		34	public static String DisabledExpressionVMNode_disabled_no_columns;
		35
33	static {	36	static {
34	// initialize resource bundle	37	// initialize resource bundle
35	NLS.initializeMessages(BUNDLE_NAME, MessagesForExpressionVM.class);	38	NLS.initializeMessages(BUNDLE_NAME, MessagesForExpressionVM.class);

Lines 19-21 Link Here

(-)src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/messages.properties (+3 lines)
19	ExpressionManagerLayoutNode__invalidExpression_nameColumn_label=Invalid expression	19	ExpressionManagerLayoutNode__invalidExpression_nameColumn_label=Invalid expression
20	ExpressionManagerLayoutNode__invalidExpression_valueColumn_label=Invalid expression	20	ExpressionManagerLayoutNode__invalidExpression_valueColumn_label=Invalid expression
21	ExpressionManagerLayoutNode__newExpression_label=Add new expression	21	ExpressionManagerLayoutNode__newExpression_label=Add new expression
		22
		23	DisabledExpressionVMNode_disabled_value=(disabled)
		24	DisabledExpressionVMNode_disabled_no_columns={0} (disabled)

Return to bug 308540

Added Link Here

(-)src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/DisabledExpressionVMNode.java (+163 lines)
1	/*******************************************************************************
2	* Copyright (c) 2010 Wind River Systems and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Wind River Systems - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.cdt.dsf.debug.ui.viewmodel.expression;
12
13	import java.text.MessageFormat;
14
15	import org.eclipse.cdt.dsf.concurrent.IDsfStatusConstants;
16	import org.eclipse.cdt.dsf.concurrent.RequestMonitor;
17	import org.eclipse.cdt.dsf.debug.ui.viewmodel.IDebugVMConstants;
18	import org.eclipse.cdt.dsf.internal.ui.DsfUIPlugin;
19	import org.eclipse.cdt.dsf.ui.viewmodel.AbstractVMNode;
20	import org.eclipse.cdt.dsf.ui.viewmodel.IVMNode;
21	import org.eclipse.cdt.dsf.ui.viewmodel.IVMProvider;
22	import org.eclipse.cdt.dsf.ui.viewmodel.VMDelta;
23	import org.eclipse.core.runtime.IStatus;
24	import org.eclipse.core.runtime.Status;
25	import org.eclipse.debug.core.model.IExpression;
26	import org.eclipse.debug.core.model.IWatchExpression;
27	import org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenCountUpdate;
28	import org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenUpdate;
29	import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementEditor;
30	import org.eclipse.debug.internal.ui.viewers.model.provisional.IHasChildrenUpdate;
31	import org.eclipse.debug.internal.ui.viewers.model.provisional.ILabelUpdate;
32	import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta;
33	import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;
34	import org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate;
35	import org.eclipse.debug.ui.DebugUITools;
36	import org.eclipse.debug.ui.IDebugUIConstants;
37	import org.eclipse.jface.resource.JFaceResources;
38	import org.eclipse.jface.viewers.CellEditor;
39	import org.eclipse.jface.viewers.ICellModifier;
40	import org.eclipse.jface.viewers.TextCellEditor;
41	import org.eclipse.jface.viewers.TreePath;
42	import org.eclipse.swt.widgets.Composite;
43
44	/**
45	* Expression VM Node which handles displaying disabled expressions.
46	*
47	* @since 2.1
48	*/
49	public class DisabledExpressionVMNode extends AbstractVMNode
50	implements IExpressionVMNode, IElementEditor
51	{
52
53	/** Cached reference to a cell modifier for editing expression strings of disabled expressions */
54	private WatchExpressionCellModifier fWatchExpressionCellModifier = new WatchExpressionCellModifier();
55
56
57	private static class DisabledExpressionVMContext extends InvalidExpressionVMContext {
58
59	private static final MessageFormat NO_COLUMN_FORMAT = new MessageFormat(MessagesForExpressionVM.DisabledExpressionVMNode_disabled_no_columns);
60
61	DisabledExpressionVMContext(IVMNode node, IExpression expression) {
62	super(node, expression);
63	}
64
65	/**
66	* Updates the label for the DisabledExpressionVMNode.
67	*/
68	@Override
69	public void update(ILabelUpdate[] updates) {
70	for (ILabelUpdate update : updates) {
71	if (update.getColumnIds() == null) {
72	update.setLabel(NO_COLUMN_FORMAT.format( new Object[] { getExpression().getExpressionText() }), 0);
73	update.setImageDescriptor(DebugUITools.getImageDescriptor( IDebugUIConstants.IMG_OBJS_EXPRESSION ), 0);
74	} else {
75	String[] columnIds = update.getColumnIds();
76
77	for (int i = 0; i < update.getColumnIds().length; i++) {
78	if (IDebugVMConstants.COLUMN_ID__EXPRESSION.equals(columnIds[i]) \|\|
79	IDebugVMConstants.COLUMN_ID__NAME.equals(columnIds[i]))
80	{
81	update.setLabel(getExpression().getExpressionText(), i);
82	update.setImageDescriptor(DebugUITools.getImageDescriptor( IDebugUIConstants.IMG_OBJS_EXPRESSION ), i);
83	} else {
84	update.setLabel(MessagesForExpressionVM.DisabledExpressionVMNode_disabled_value, i);
85	}
86	update.setFontData(JFaceResources.getFontDescriptor(IDebugUIConstants.PREF_VARIABLE_TEXT_FONT).getFontData()[0], i);
87	}
88	}
89	update.done();
90	}
91	}
92
93	}
94
95	public DisabledExpressionVMNode(IVMProvider provider) {
96	super(provider);
97	}
98
99	public boolean canParseExpression(IExpression expression) {
100	return expression instanceof IWatchExpression && !((IWatchExpression)expression).isEnabled();
101	}
102
103	public int getDeltaFlagsForExpression(IExpression expression, Object event) {
104	return IModelDelta.NO_CHANGE;
105	}
106
107	public int getDeltaFlags(Object event) {
108	return IModelDelta.NO_CHANGE;
109	}
110
111	public void buildDelta(Object event, VMDelta parent, int nodeOffset, RequestMonitor requestMonitor) {
112	requestMonitor.done();
113	}
114
115	public void update(IChildrenCountUpdate[] updates) {
116	for (IViewerUpdate update : updates) {
117	update.setStatus(new Status(IStatus.ERROR, DsfUIPlugin.PLUGIN_ID, IDsfStatusConstants.NOT_SUPPORTED, "Not supported", null)); //$NON-NLS-1$
118	update.done();
119	}
120	}
121
122	public void update(IChildrenUpdate[] updates) {
123	for (IViewerUpdate update : updates) {
124	update.setStatus(new Status(IStatus.ERROR, DsfUIPlugin.PLUGIN_ID, IDsfStatusConstants.NOT_SUPPORTED, "Not supported", null)); //$NON-NLS-1$
125	update.done();
126	}
127	}
128
129	public void update(IHasChildrenUpdate[] updates) {
130	for (IViewerUpdate update : updates) {
131	update.setStatus(new Status(IStatus.ERROR, DsfUIPlugin.PLUGIN_ID, IDsfStatusConstants.NOT_SUPPORTED, "Not supported", null)); //$NON-NLS-1$
132	update.done();
133	}
134	}
135
136	public void update(IExpressionUpdate update) {
137	update.setExpressionElement(new DisabledExpressionVMContext(this, update.getExpression()));
138	update.done();
139	}
140
141	public void buildDeltaForExpression(IExpression expression, int elementIdx, Object event, VMDelta parentDelta,
142	TreePath path, RequestMonitor rm)
143	{
144	rm.done();
145	}
146
147	public void buildDeltaForExpressionElement(Object element, int elementIdx, Object event, VMDelta parentDelta,
148	RequestMonitor rm) {
149	rm.done();
150	}
151
152	public CellEditor getCellEditor(IPresentationContext context, String columnId, Object element, Composite parent) {
153	if (IDebugVMConstants.COLUMN_ID__EXPRESSION.equals(columnId)) {
154	return new TextCellEditor(parent);
155	}
156	return null;
157	}
158
159	public ICellModifier getCellModifier(IPresentationContext context, Object element) {
160	return fWatchExpressionCellModifier;
161	}
162
163	}