Attachment #87734 for bug #216376

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

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




import org.eclipse.dd.dsf.ui.viewmodel.dm.AbstractDMVMProvider;
import org.eclipse.dd.dsf.ui.viewmodel.dm.CompositeDMVMContext;
import org.eclipse.dd.dsf.ui.viewmodel.dm.IDMVMContext;
import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.model.IDebugTarget;
import org.eclipse.debug.core.model.IExpression;
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.IInternalDebugUIConstants;
import org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenUpdate;

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.actions.IWatchExpressionFactoryAdapter2;
import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.jface.viewers.ICellModifier;

    
    private final SyncVariableDataAccess fSyncVariableDataAccess;
    
    public class VariableExpressionVMC extends DMVMContext implements IFormattedValueVMContext  {
        
        private IExpression fExpression;
        

        public Object getAdapter(Class adapter) {
            if (fExpression != null && adapter.isAssignableFrom(fExpression.getClass())) {
                return fExpression;
            } else if (adapter.isAssignableFrom(IWatchExpressionFactoryAdapter2.class)) {
                return fVariableExpressionFactory;
            } else {
                return super.getAdapter(adapter);

        public int hashCode() {
            return super.hashCode() + (fExpression != null ? fExpression.hashCode() : 0);
        }

        public String getName() throws DebugException { return toString(); }
        public String getReferenceTypeName() throws DebugException { return ""; } //$NON-NLS-1$
        public IValue getValue() throws DebugException { return null; }
        public boolean hasValueChanged() throws DebugException { return false; }
        public void setValue(IValue value) throws DebugException {}
        public void setValue(String expression) throws DebugException {}
        public boolean supportsValueModification() { return false; }
        public boolean verifyValue(IValue value) throws DebugException { return false; }
        public boolean verifyValue(String expression) throws DebugException { return false; }
        public IDebugTarget getDebugTarget() { return null;}
        public ILaunch getLaunch() { return null; }
        public String getModelIdentifier() { return DsfDebugUIPlugin.PLUGIN_ID; }
    }
    
    protected class VariableExpressionFactory implements IWatchExpressionFactoryAdapter2 {

        public boolean canCreateWatchExpression(Object element) {
            return element instanceof VariableExpressionVMC;
        }

        public String createWatchExpression(Object element) throws CoreException {
            
            VariableExpressionVMC exprVmc = (VariableExpressionVMC) element;
            
            IExpressionDMContext exprDmc = DMContexts.getAncestorOfType(exprVmc.getDMContext(), IExpressionDMContext.class);
            if (exprDmc != null) {




import org.eclipse.dd.dsf.ui.viewmodel.VMDelta;
import org.eclipse.dd.dsf.ui.viewmodel.dm.AbstractDMVMProvider;
import org.eclipse.dd.dsf.ui.viewmodel.dm.IDMVMContext;
import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.model.IDebugTarget;
import org.eclipse.debug.core.model.IExpression;
import org.eclipse.debug.core.model.IValue;
import org.eclipse.debug.core.model.IVariable;
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.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.internal.ui.viewers.model.provisional.IPresentationContext;
import org.eclipse.debug.ui.actions.IWatchExpressionFactoryAdapter2;
import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.jface.viewers.ComboBoxCellEditor;

{

    protected class BitFieldVMC extends DMVMContext
        implements IFormattedValueVMContext
    {
        private IExpression fExpression;
        public BitFieldVMC(IDMContext dmc) {

        public Object getAdapter(Class adapter) {
            if (fExpression != null && adapter.isAssignableFrom(fExpression.getClass())) {
                return fExpression;
            } else if (adapter.isAssignableFrom(IWatchExpressionFactoryAdapter2.class)) {
                return fBitFieldExpressionFactory;
            } else {
                return super.getAdapter(adapter);

        public int hashCode() {
            return super.hashCode() + (fExpression != null ? fExpression.hashCode() : 0);
        }
    
        public String getName() throws DebugException { return toString(); }
        public String getReferenceTypeName() throws DebugException { return ""; } //$NON-NLS-1$
        public IValue getValue() throws DebugException { return null; }
        public boolean hasValueChanged() throws DebugException { return false; }
        public void setValue(IValue value) throws DebugException {}
        public void setValue(String expression) throws DebugException {}
        public boolean supportsValueModification() { return false; }
        public boolean verifyValue(IValue value) throws DebugException { return false; }
        public boolean verifyValue(String expression) throws DebugException { return false; }
        public IDebugTarget getDebugTarget() { return null;}
        public ILaunch getLaunch() { return null; }
        public String getModelIdentifier() { return DsfDebugUIPlugin.PLUGIN_ID; }
    }

    protected class BitFieldExpressionFactory implements IWatchExpressionFactoryAdapter2 {
        
        public boolean canCreateWatchExpression(Object element) {
            return element instanceof BitFieldVMC;
        }
        
        public String createWatchExpression(Object element) throws CoreException {
            BitFieldVMC bitFieldVmc = ((BitFieldVMC)element);

            StringBuffer exprBuf = new StringBuffer();
            IRegisterGroupDMContext groupDmc = 




import org.eclipse.dd.dsf.ui.viewmodel.dm.AbstractDMVMProvider;
import org.eclipse.dd.dsf.ui.viewmodel.dm.CompositeDMVMContext;
import org.eclipse.dd.dsf.ui.viewmodel.dm.IDMVMContext;
import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.model.IDebugTarget;
import org.eclipse.debug.core.model.IExpression;
import org.eclipse.debug.core.model.IValue;
import org.eclipse.debug.core.model.IVariable;
import org.eclipse.debug.internal.ui.DebugPluginImages;
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.IModelDelta;
import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;
import org.eclipse.debug.ui.IDebugUIConstants;
import org.eclipse.debug.ui.actions.IWatchExpressionFactoryAdapter2;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.jface.viewers.ICellModifier;
import org.eclipse.jface.viewers.TextCellEditor;

    implements IElementEditor, IElementLabelProvider
{

    protected class RegisterGroupVMC extends DMVMContext
    {
        private IExpression fExpression;
        public RegisterGroupVMC(IDMContext dmc) {

        public Object getAdapter(Class adapter) {
            if (fExpression != null && adapter.isAssignableFrom(fExpression.getClass())) {
                return fExpression;
            } else if (adapter.isAssignableFrom(IWatchExpressionFactoryAdapter2.class)) {
                return fRegisterGroupExpressionFactory;
            } else {
                return super.getAdapter(adapter);

        public int hashCode() {
            return super.hashCode() + (fExpression != null ? fExpression.hashCode() : 0);
        }

        public String getName() throws DebugException { return toString(); }
        public String getReferenceTypeName() throws DebugException { return ""; } //$NON-NLS-1$
        public IValue getValue() throws DebugException { return null; }
        public boolean hasValueChanged() throws DebugException { return false; }
        public void setValue(IValue value) throws DebugException {}
        public void setValue(String expression) throws DebugException {}
        public boolean supportsValueModification() { return false; }
        public boolean verifyValue(IValue value) throws DebugException { return false; }
        public boolean verifyValue(String expression) throws DebugException { return false; }
        public IDebugTarget getDebugTarget() { return null;}
        public ILaunch getLaunch() { return null; }
        public String getModelIdentifier() { return DsfDebugUIPlugin.PLUGIN_ID; }
    }
    
    protected class RegisterGroupExpressionFactory implements IWatchExpressionFactoryAdapter2 {
        
        public boolean canCreateWatchExpression(Object element) {
            return element instanceof RegisterGroupVMC;
        }
        
        public String createWatchExpression(Object element) throws CoreException {
            RegisterGroupVMC registerVmc = ((RegisterGroupVMC)element);

            StringBuffer exprBuf = new StringBuffer();
            IRegisterGroupDMContext groupDmc = DMContexts.getAncestorOfType(registerVmc.getDMContext(), IRegisterGroupDMContext.class);




import org.eclipse.dd.dsf.ui.viewmodel.dm.AbstractDMVMProvider;
import org.eclipse.dd.dsf.ui.viewmodel.dm.CompositeDMVMContext;
import org.eclipse.dd.dsf.ui.viewmodel.dm.IDMVMContext;
import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.model.IDebugTarget;
import org.eclipse.debug.core.model.IExpression;
import org.eclipse.debug.core.model.IValue;
import org.eclipse.debug.core.model.IVariable;
import org.eclipse.debug.internal.ui.DebugPluginImages;
import org.eclipse.debug.internal.ui.DebugUIPlugin;
import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;

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.debug.ui.actions.IWatchExpressionFactoryAdapter2;
import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.jface.viewers.ICellModifier;

    implements IElementEditor, IElementLabelProvider
{
    protected class RegisterVMC extends DMVMContext
        implements IFormattedValueVMContext
    {
        private IExpression fExpression;
        public RegisterVMC(IDMContext dmc) {

        public Object getAdapter(Class adapter) {
            if (fExpression != null && adapter.isAssignableFrom(fExpression.getClass())) {
                return fExpression;
            } else if (adapter.isAssignableFrom(IWatchExpressionFactoryAdapter2.class)) {
                return fRegisterExpressionFactory;
            } else {
                return super.getAdapter(adapter);

        public IFormattedValuePreferenceStore getPreferenceStore() {
            return fFormattedPrefStore;
        }
        
        public String getName() throws DebugException { return toString(); }
        public String getReferenceTypeName() throws DebugException { return ""; } //$NON-NLS-1$
        public IValue getValue() throws DebugException { return null; }
        public boolean hasValueChanged() throws DebugException { return false; }
        public void setValue(IValue value) throws DebugException {}
        public void setValue(String expression) throws DebugException {}
        public boolean supportsValueModification() { return false; }
        public boolean verifyValue(IValue value) throws DebugException { return false; }
        public boolean verifyValue(String expression) throws DebugException { return false; }
        public IDebugTarget getDebugTarget() { return null;}
        public ILaunch getLaunch() { return null; }
        public String getModelIdentifier() { return DsfDebugUIPlugin.PLUGIN_ID; }
    }

    protected class RegisterExpressionFactory implements IWatchExpressionFactoryAdapter2 {

        public boolean canCreateWatchExpression(Object element) {
            return element instanceof RegisterVMC;
        }

        public String createWatchExpression(Object element) throws CoreException {
            RegisterVMC registerVmc = ((RegisterVMC)element);

            StringBuffer exprBuf = new StringBuffer();
            IRegisterGroupDMContext groupDmc = 

Return to bug 216376

Lines 48-59 Link Here

(-)src/org/eclipse/dd/dsf/debug/ui/viewmodel/variable/VariableVMNode.java (-26 / +8 lines)
48	import org.eclipse.dd.dsf.ui.viewmodel.dm.AbstractDMVMProvider;	48	import org.eclipse.dd.dsf.ui.viewmodel.dm.AbstractDMVMProvider;
49	import org.eclipse.dd.dsf.ui.viewmodel.dm.CompositeDMVMContext;	49	import org.eclipse.dd.dsf.ui.viewmodel.dm.CompositeDMVMContext;
50	import org.eclipse.dd.dsf.ui.viewmodel.dm.IDMVMContext;	50	import org.eclipse.dd.dsf.ui.viewmodel.dm.IDMVMContext;
51	import org.eclipse.debug.core.DebugException;
52	import org.eclipse.debug.core.ILaunch;
53	import org.eclipse.debug.core.model.IDebugTarget;
54	import org.eclipse.debug.core.model.IExpression;	51	import org.eclipse.debug.core.model.IExpression;
55	import org.eclipse.debug.core.model.IValue;
56	import org.eclipse.debug.core.model.IVariable;
57	import org.eclipse.debug.internal.ui.DebugUIPlugin;	52	import org.eclipse.debug.internal.ui.DebugUIPlugin;
58	import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;	53	import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
59	import org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenUpdate;	54	import org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenUpdate;
Lines 63-69 Link Here
63	import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta;	58	import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta;
64	import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;	59	import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;
65	import org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate;	60	import org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate;
66	import org.eclipse.debug.ui.actions.IWatchExpressionFactoryAdapterExtension;	61	import org.eclipse.debug.ui.actions.IWatchExpressionFactoryAdapter2;
67	import org.eclipse.jface.util.PropertyChangeEvent;	62	import org.eclipse.jface.util.PropertyChangeEvent;
68	import org.eclipse.jface.viewers.CellEditor;	63	import org.eclipse.jface.viewers.CellEditor;
69	import org.eclipse.jface.viewers.ICellModifier;	64	import org.eclipse.jface.viewers.ICellModifier;
Lines 128-134 Link Here
128		123
129	private final SyncVariableDataAccess fSyncVariableDataAccess;	124	private final SyncVariableDataAccess fSyncVariableDataAccess;
130		125
131	public class VariableExpressionVMC extends DMVMContext implements IFormattedValueVMContext, IVariable {	126	public class VariableExpressionVMC extends DMVMContext implements IFormattedValueVMContext {
132		127
133	private IExpression fExpression;	128	private IExpression fExpression;
134		129
Lines 149-155 Link Here
149	public Object getAdapter(Class adapter) {	144	public Object getAdapter(Class adapter) {
150	if (fExpression != null && adapter.isAssignableFrom(fExpression.getClass())) {	145	if (fExpression != null && adapter.isAssignableFrom(fExpression.getClass())) {
151	return fExpression;	146	return fExpression;
152	} else if (adapter.isAssignableFrom(IWatchExpressionFactoryAdapterExtension.class)) {	147	} else if (adapter.isAssignableFrom(IWatchExpressionFactoryAdapter2.class)) {
153	return fVariableExpressionFactory;	148	return fVariableExpressionFactory;
154	} else {	149	} else {
155	return super.getAdapter(adapter);	150	return super.getAdapter(adapter);
Lines 170-199 Link Here
170	public int hashCode() {	165	public int hashCode() {
171	return super.hashCode() + (fExpression != null ? fExpression.hashCode() : 0);	166	return super.hashCode() + (fExpression != null ? fExpression.hashCode() : 0);
172	}	167	}
173
174	public String getName() throws DebugException { return toString(); }
175	public String getReferenceTypeName() throws DebugException { return ""; } //$NON-NLS-1$
176	public IValue getValue() throws DebugException { return null; }
177	public boolean hasValueChanged() throws DebugException { return false; }
178	public void setValue(IValue value) throws DebugException {}
179	public void setValue(String expression) throws DebugException {}
180	public boolean supportsValueModification() { return false; }
181	public boolean verifyValue(IValue value) throws DebugException { return false; }
182	public boolean verifyValue(String expression) throws DebugException { return false; }
183	public IDebugTarget getDebugTarget() { return null;}
184	public ILaunch getLaunch() { return null; }
185	public String getModelIdentifier() { return DsfDebugUIPlugin.PLUGIN_ID; }
186	}	168	}
187		169
188	protected class VariableExpressionFactory implements IWatchExpressionFactoryAdapterExtension {	170	protected class VariableExpressionFactory implements IWatchExpressionFactoryAdapter2 {
189		171
190	public boolean canCreateWatchExpression(IVariable variable) {	172	public boolean canCreateWatchExpression(Object element) {
191	return variable instanceof VariableExpressionVMC;	173	return element instanceof VariableExpressionVMC;
192	}	174	}
193		175
194	public String createWatchExpression(IVariable variable) throws CoreException {	176	public String createWatchExpression(Object element) throws CoreException {
195		177
196	VariableExpressionVMC exprVmc = (VariableExpressionVMC) variable;	178	VariableExpressionVMC exprVmc = (VariableExpressionVMC) element;
197		179
198	IExpressionDMContext exprDmc = DMContexts.getAncestorOfType(exprVmc.getDMContext(), IExpressionDMContext.class);	180	IExpressionDMContext exprDmc = DMContexts.getAncestorOfType(exprVmc.getDMContext(), IExpressionDMContext.class);
199	if (exprDmc != null) {	181	if (exprDmc != null) {

Lines 44-62 Link Here

(-)src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterBitFieldVMNode.java (-26 / +8 lines)
44	import org.eclipse.dd.dsf.ui.viewmodel.VMDelta;	44	import org.eclipse.dd.dsf.ui.viewmodel.VMDelta;
45	import org.eclipse.dd.dsf.ui.viewmodel.dm.AbstractDMVMProvider;	45	import org.eclipse.dd.dsf.ui.viewmodel.dm.AbstractDMVMProvider;
46	import org.eclipse.dd.dsf.ui.viewmodel.dm.IDMVMContext;	46	import org.eclipse.dd.dsf.ui.viewmodel.dm.IDMVMContext;
47	import org.eclipse.debug.core.DebugException;
48	import org.eclipse.debug.core.ILaunch;
49	import org.eclipse.debug.core.model.IDebugTarget;
50	import org.eclipse.debug.core.model.IExpression;	47	import org.eclipse.debug.core.model.IExpression;
51	import org.eclipse.debug.core.model.IValue;
52	import org.eclipse.debug.core.model.IVariable;
53	import org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenUpdate;	48	import org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenUpdate;
54	import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementEditor;	49	import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementEditor;
55	import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementLabelProvider;	50	import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementLabelProvider;
56	import org.eclipse.debug.internal.ui.viewers.model.provisional.ILabelUpdate;	51	import org.eclipse.debug.internal.ui.viewers.model.provisional.ILabelUpdate;
57	import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta;	52	import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta;
58	import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;	53	import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;
59	import org.eclipse.debug.ui.actions.IWatchExpressionFactoryAdapterExtension;	54	import org.eclipse.debug.ui.actions.IWatchExpressionFactoryAdapter2;
60	import org.eclipse.jface.util.PropertyChangeEvent;	55	import org.eclipse.jface.util.PropertyChangeEvent;
61	import org.eclipse.jface.viewers.CellEditor;	56	import org.eclipse.jface.viewers.CellEditor;
62	import org.eclipse.jface.viewers.ComboBoxCellEditor;	57	import org.eclipse.jface.viewers.ComboBoxCellEditor;
Lines 71-77 Link Here
71	{	66	{
72		67
73	protected class BitFieldVMC extends DMVMContext	68	protected class BitFieldVMC extends DMVMContext
74	implements IVariable, IFormattedValueVMContext	69	implements IFormattedValueVMContext
75	{	70	{
76	private IExpression fExpression;	71	private IExpression fExpression;
77	public BitFieldVMC(IDMContext dmc) {	72	public BitFieldVMC(IDMContext dmc) {
Lines 91-97 Link Here
91	public Object getAdapter(Class adapter) {	86	public Object getAdapter(Class adapter) {
92	if (fExpression != null && adapter.isAssignableFrom(fExpression.getClass())) {	87	if (fExpression != null && adapter.isAssignableFrom(fExpression.getClass())) {
93	return fExpression;	88	return fExpression;
94	} else if (adapter.isAssignableFrom(IWatchExpressionFactoryAdapterExtension.class)) {	89	} else if (adapter.isAssignableFrom(IWatchExpressionFactoryAdapter2.class)) {
95	return fBitFieldExpressionFactory;	90	return fBitFieldExpressionFactory;
96	} else {	91	} else {
97	return super.getAdapter(adapter);	92	return super.getAdapter(adapter);
Lines 112-140 Link Here
112	public int hashCode() {	107	public int hashCode() {
113	return super.hashCode() + (fExpression != null ? fExpression.hashCode() : 0);	108	return super.hashCode() + (fExpression != null ? fExpression.hashCode() : 0);
114	}	109	}
115
116	public String getName() throws DebugException { return toString(); }
117	public String getReferenceTypeName() throws DebugException { return ""; } //$NON-NLS-1$
118	public IValue getValue() throws DebugException { return null; }
119	public boolean hasValueChanged() throws DebugException { return false; }
120	public void setValue(IValue value) throws DebugException {}
121	public void setValue(String expression) throws DebugException {}
122	public boolean supportsValueModification() { return false; }
123	public boolean verifyValue(IValue value) throws DebugException { return false; }
124	public boolean verifyValue(String expression) throws DebugException { return false; }
125	public IDebugTarget getDebugTarget() { return null;}
126	public ILaunch getLaunch() { return null; }
127	public String getModelIdentifier() { return DsfDebugUIPlugin.PLUGIN_ID; }
128	}	110	}
129		111
130	protected class BitFieldExpressionFactory implements IWatchExpressionFactoryAdapterExtension {	112	protected class BitFieldExpressionFactory implements IWatchExpressionFactoryAdapter2 {
131		113
132	public boolean canCreateWatchExpression(IVariable variable) {	114	public boolean canCreateWatchExpression(Object element) {
133	return variable instanceof BitFieldVMC;	115	return element instanceof BitFieldVMC;
134	}	116	}
135		117
136	public String createWatchExpression(IVariable variable) throws CoreException {	118	public String createWatchExpression(Object element) throws CoreException {
137	BitFieldVMC bitFieldVmc = ((BitFieldVMC)variable);	119	BitFieldVMC bitFieldVmc = ((BitFieldVMC)element);
138		120
139	StringBuffer exprBuf = new StringBuffer();	121	StringBuffer exprBuf = new StringBuffer();
140	IRegisterGroupDMContext groupDmc =	122	IRegisterGroupDMContext groupDmc =

Lines 36-47 Link Here

(-)src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterGroupVMNode.java (-26 / +8 lines)
36	import org.eclipse.dd.dsf.ui.viewmodel.dm.AbstractDMVMProvider;	36	import org.eclipse.dd.dsf.ui.viewmodel.dm.AbstractDMVMProvider;
37	import org.eclipse.dd.dsf.ui.viewmodel.dm.CompositeDMVMContext;	37	import org.eclipse.dd.dsf.ui.viewmodel.dm.CompositeDMVMContext;
38	import org.eclipse.dd.dsf.ui.viewmodel.dm.IDMVMContext;	38	import org.eclipse.dd.dsf.ui.viewmodel.dm.IDMVMContext;
39	import org.eclipse.debug.core.DebugException;
40	import org.eclipse.debug.core.ILaunch;
41	import org.eclipse.debug.core.model.IDebugTarget;
42	import org.eclipse.debug.core.model.IExpression;	39	import org.eclipse.debug.core.model.IExpression;
43	import org.eclipse.debug.core.model.IValue;
44	import org.eclipse.debug.core.model.IVariable;
45	import org.eclipse.debug.internal.ui.DebugPluginImages;	40	import org.eclipse.debug.internal.ui.DebugPluginImages;
46	import org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenUpdate;	41	import org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenUpdate;
47	import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementEditor;	42	import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementEditor;
Lines 50-56 Link Here
50	import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta;	45	import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta;
51	import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;	46	import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;
52	import org.eclipse.debug.ui.IDebugUIConstants;	47	import org.eclipse.debug.ui.IDebugUIConstants;
53	import org.eclipse.debug.ui.actions.IWatchExpressionFactoryAdapterExtension;	48	import org.eclipse.debug.ui.actions.IWatchExpressionFactoryAdapter2;
54	import org.eclipse.jface.viewers.CellEditor;	49	import org.eclipse.jface.viewers.CellEditor;
55	import org.eclipse.jface.viewers.ICellModifier;	50	import org.eclipse.jface.viewers.ICellModifier;
56	import org.eclipse.jface.viewers.TextCellEditor;	51	import org.eclipse.jface.viewers.TextCellEditor;
Lines 62-68 Link Here
62	implements IElementEditor, IElementLabelProvider	57	implements IElementEditor, IElementLabelProvider
63	{	58	{
64		59
65	protected class RegisterGroupVMC extends DMVMContext implements IVariable	60	protected class RegisterGroupVMC extends DMVMContext
66	{	61	{
67	private IExpression fExpression;	62	private IExpression fExpression;
68	public RegisterGroupVMC(IDMContext dmc) {	63	public RegisterGroupVMC(IDMContext dmc) {
Lines 78-84 Link Here
78	public Object getAdapter(Class adapter) {	73	public Object getAdapter(Class adapter) {
79	if (fExpression != null && adapter.isAssignableFrom(fExpression.getClass())) {	74	if (fExpression != null && adapter.isAssignableFrom(fExpression.getClass())) {
80	return fExpression;	75	return fExpression;
81	} else if (adapter.isAssignableFrom(IWatchExpressionFactoryAdapterExtension.class)) {	76	} else if (adapter.isAssignableFrom(IWatchExpressionFactoryAdapter2.class)) {
82	return fRegisterGroupExpressionFactory;	77	return fRegisterGroupExpressionFactory;
83	} else {	78	} else {
84	return super.getAdapter(adapter);	79	return super.getAdapter(adapter);
Lines 99-127 Link Here
99	public int hashCode() {	94	public int hashCode() {
100	return super.hashCode() + (fExpression != null ? fExpression.hashCode() : 0);	95	return super.hashCode() + (fExpression != null ? fExpression.hashCode() : 0);
101	}	96	}
102
103	public String getName() throws DebugException { return toString(); }
104	public String getReferenceTypeName() throws DebugException { return ""; } //$NON-NLS-1$
105	public IValue getValue() throws DebugException { return null; }
106	public boolean hasValueChanged() throws DebugException { return false; }
107	public void setValue(IValue value) throws DebugException {}
108	public void setValue(String expression) throws DebugException {}
109	public boolean supportsValueModification() { return false; }
110	public boolean verifyValue(IValue value) throws DebugException { return false; }
111	public boolean verifyValue(String expression) throws DebugException { return false; }
112	public IDebugTarget getDebugTarget() { return null;}
113	public ILaunch getLaunch() { return null; }
114	public String getModelIdentifier() { return DsfDebugUIPlugin.PLUGIN_ID; }
115	}	97	}
116		98
117	protected class RegisterGroupExpressionFactory implements IWatchExpressionFactoryAdapterExtension {	99	protected class RegisterGroupExpressionFactory implements IWatchExpressionFactoryAdapter2 {
118		100
119	public boolean canCreateWatchExpression(IVariable variable) {	101	public boolean canCreateWatchExpression(Object element) {
120	return variable instanceof RegisterGroupVMC;	102	return element instanceof RegisterGroupVMC;
121	}	103	}
122		104
123	public String createWatchExpression(IVariable variable) throws CoreException {	105	public String createWatchExpression(Object element) throws CoreException {
124	RegisterGroupVMC registerVmc = ((RegisterGroupVMC)variable);	106	RegisterGroupVMC registerVmc = ((RegisterGroupVMC)element);
125		107
126	StringBuffer exprBuf = new StringBuffer();	108	StringBuffer exprBuf = new StringBuffer();
127	IRegisterGroupDMContext groupDmc = DMContexts.getAncestorOfType(registerVmc.getDMContext(), IRegisterGroupDMContext.class);	109	IRegisterGroupDMContext groupDmc = DMContexts.getAncestorOfType(registerVmc.getDMContext(), IRegisterGroupDMContext.class);

Lines 41-52 Link Here

(-)src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterVMNode.java (-26 / +8 lines)
41	import org.eclipse.dd.dsf.ui.viewmodel.dm.AbstractDMVMProvider;	41	import org.eclipse.dd.dsf.ui.viewmodel.dm.AbstractDMVMProvider;
42	import org.eclipse.dd.dsf.ui.viewmodel.dm.CompositeDMVMContext;	42	import org.eclipse.dd.dsf.ui.viewmodel.dm.CompositeDMVMContext;
43	import org.eclipse.dd.dsf.ui.viewmodel.dm.IDMVMContext;	43	import org.eclipse.dd.dsf.ui.viewmodel.dm.IDMVMContext;
44	import org.eclipse.debug.core.DebugException;
45	import org.eclipse.debug.core.ILaunch;
46	import org.eclipse.debug.core.model.IDebugTarget;
47	import org.eclipse.debug.core.model.IExpression;	44	import org.eclipse.debug.core.model.IExpression;
48	import org.eclipse.debug.core.model.IValue;
49	import org.eclipse.debug.core.model.IVariable;
50	import org.eclipse.debug.internal.ui.DebugPluginImages;	45	import org.eclipse.debug.internal.ui.DebugPluginImages;
51	import org.eclipse.debug.internal.ui.DebugUIPlugin;	46	import org.eclipse.debug.internal.ui.DebugUIPlugin;
52	import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;	47	import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
Lines 57-63 Link Here
57	import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta;	52	import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta;
58	import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;	53	import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;
59	import org.eclipse.debug.ui.IDebugUIConstants;	54	import org.eclipse.debug.ui.IDebugUIConstants;
60	import org.eclipse.debug.ui.actions.IWatchExpressionFactoryAdapterExtension;	55	import org.eclipse.debug.ui.actions.IWatchExpressionFactoryAdapter2;
61	import org.eclipse.jface.util.PropertyChangeEvent;	56	import org.eclipse.jface.util.PropertyChangeEvent;
62	import org.eclipse.jface.viewers.CellEditor;	57	import org.eclipse.jface.viewers.CellEditor;
63	import org.eclipse.jface.viewers.ICellModifier;	58	import org.eclipse.jface.viewers.ICellModifier;
Lines 70-76 Link Here
70	implements IElementEditor, IElementLabelProvider	65	implements IElementEditor, IElementLabelProvider
71	{	66	{
72	protected class RegisterVMC extends DMVMContext	67	protected class RegisterVMC extends DMVMContext
73	implements IVariable, IFormattedValueVMContext	68	implements IFormattedValueVMContext
74	{	69	{
75	private IExpression fExpression;	70	private IExpression fExpression;
76	public RegisterVMC(IDMContext dmc) {	71	public RegisterVMC(IDMContext dmc) {
Lines 86-92 Link Here
86	public Object getAdapter(Class adapter) {	81	public Object getAdapter(Class adapter) {
87	if (fExpression != null && adapter.isAssignableFrom(fExpression.getClass())) {	82	if (fExpression != null && adapter.isAssignableFrom(fExpression.getClass())) {
88	return fExpression;	83	return fExpression;
89	} else if (adapter.isAssignableFrom(IWatchExpressionFactoryAdapterExtension.class)) {	84	} else if (adapter.isAssignableFrom(IWatchExpressionFactoryAdapter2.class)) {
90	return fRegisterExpressionFactory;	85	return fRegisterExpressionFactory;
91	} else {	86	} else {
92	return super.getAdapter(adapter);	87	return super.getAdapter(adapter);
Lines 111-139 Link Here
111	public IFormattedValuePreferenceStore getPreferenceStore() {	106	public IFormattedValuePreferenceStore getPreferenceStore() {
112	return fFormattedPrefStore;	107	return fFormattedPrefStore;
113	}	108	}
114
115	public String getName() throws DebugException { return toString(); }
116	public String getReferenceTypeName() throws DebugException { return ""; } //$NON-NLS-1$
117	public IValue getValue() throws DebugException { return null; }
118	public boolean hasValueChanged() throws DebugException { return false; }
119	public void setValue(IValue value) throws DebugException {}
120	public void setValue(String expression) throws DebugException {}
121	public boolean supportsValueModification() { return false; }
122	public boolean verifyValue(IValue value) throws DebugException { return false; }
123	public boolean verifyValue(String expression) throws DebugException { return false; }
124	public IDebugTarget getDebugTarget() { return null;}
125	public ILaunch getLaunch() { return null; }
126	public String getModelIdentifier() { return DsfDebugUIPlugin.PLUGIN_ID; }
127	}	109	}
128		110
129	protected class RegisterExpressionFactory implements IWatchExpressionFactoryAdapterExtension {	111	protected class RegisterExpressionFactory implements IWatchExpressionFactoryAdapter2 {
130		112
131	public boolean canCreateWatchExpression(IVariable variable) {	113	public boolean canCreateWatchExpression(Object element) {
132	return variable instanceof RegisterVMC;	114	return element instanceof RegisterVMC;
133	}	115	}
134		116
135	public String createWatchExpression(IVariable variable) throws CoreException {	117	public String createWatchExpression(Object element) throws CoreException {
136	RegisterVMC registerVmc = ((RegisterVMC)variable);	118	RegisterVMC registerVmc = ((RegisterVMC)element);
137		119
138	StringBuffer exprBuf = new StringBuffer();	120	StringBuffer exprBuf = new StringBuffer();
139	IRegisterGroupDMContext groupDmc =	121	IRegisterGroupDMContext groupDmc =