diff options
15 files changed, 91 insertions, 182 deletions
diff --git a/org.eclipse.debug.ui/.options b/org.eclipse.debug.ui/.options index 5c01ca7a5..225871223 100644 --- a/org.eclipse.debug.ui/.options +++ b/org.eclipse.debug.ui/.options @@ -2,4 +2,5 @@ org.eclipse.debug.ui/debug = false org.eclipse.debug.ui/debug/viewers/model = false org.eclipse.debug.ui/debug/viewers/viewer = false org.eclipse.debug.ui/debug/viewers/deltas = false +org.eclipse.debug.ui/debug/viewers/contentProvider = false org.eclipse.debug.ui/debug/commands = false diff --git a/org.eclipse.debug.ui/META-INF/MANIFEST.MF b/org.eclipse.debug.ui/META-INF/MANIFEST.MF index 8494cf1a3..1a0de6c7a 100644 --- a/org.eclipse.debug.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.debug.ui/META-INF/MANIFEST.MF @@ -20,11 +20,14 @@ Export-Package: org.eclipse.debug.internal.ui;x-internal:=true, org.eclipse.debug.internal.ui.launchConfigurations;x-internal:=true, org.eclipse.debug.internal.ui.memory;x-internal:=true, org.eclipse.debug.internal.ui.memory.provisional;x-internal:=true, + org.eclipse.debug.internal.ui.model.elements;x-internal:=true, org.eclipse.debug.internal.ui.preferences;x-internal:=true, org.eclipse.debug.internal.ui.sourcelookup;x-internal:=true, org.eclipse.debug.internal.ui.sourcelookup.browsers;x-internal:=true, org.eclipse.debug.internal.ui.stringsubstitution;x-internal:=true, org.eclipse.debug.internal.ui.viewers;x-internal:=true, + org.eclipse.debug.internal.ui.viewers.model;x-internal:=true, + org.eclipse.debug.internal.ui.viewers.model.provisional;x-internal:=true, org.eclipse.debug.internal.ui.viewers.provisional;x-internal:=true, org.eclipse.debug.internal.ui.viewers.update;x-internal:=true, org.eclipse.debug.internal.ui.views;x-internal:=true, diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/CollapseAllAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/CollapseAllAction.java index ec3e10397..76c1110be 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/CollapseAllAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/CollapseAllAction.java @@ -12,17 +12,17 @@ package org.eclipse.debug.internal.ui.actions; import org.eclipse.debug.internal.ui.DebugPluginImages; import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; -import org.eclipse.debug.internal.ui.viewers.AsynchronousTreeViewer; import org.eclipse.jface.action.Action; +import org.eclipse.jface.viewers.TreeViewer; /** * CollapseAllAction */ public class CollapseAllAction extends Action { - private AsynchronousTreeViewer fViewer; + private TreeViewer fViewer; - public CollapseAllAction(AsynchronousTreeViewer viewer) { + public CollapseAllAction(TreeViewer viewer) { super(ActionMessages.CollapseAllAction_0, DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_COLLAPSE_ALL)); setToolTipText(ActionMessages.CollapseAllAction_0); setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_COLLAPSE_ALL)); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ConfigureColumnsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ConfigureColumnsAction.java index 059c11a7a..a6dc3e8bd 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ConfigureColumnsAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ConfigureColumnsAction.java @@ -18,8 +18,8 @@ import java.util.Map; import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.internal.ui.IDebugHelpContextIds; -import org.eclipse.debug.internal.ui.viewers.AsynchronousTreeViewer; -import org.eclipse.debug.internal.ui.viewers.provisional.IColumnPresentation; +import org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentation; +import org.eclipse.debug.internal.ui.viewers.model.provisional.TreeModelViewer; import org.eclipse.jface.action.Action; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.IStructuredContentProvider; @@ -38,7 +38,7 @@ import org.eclipse.ui.texteditor.IUpdate; */ public class ConfigureColumnsAction extends Action implements IUpdate { - private AsynchronousTreeViewer fViewer; + private TreeModelViewer fViewer; class ColumnContentProvider implements IStructuredContentProvider { @@ -98,7 +98,7 @@ public class ConfigureColumnsAction extends Action implements IUpdate { } - public ConfigureColumnsAction(AsynchronousTreeViewer viewer) { + public ConfigureColumnsAction(TreeModelViewer viewer) { setText(ActionMessages.ConfigureColumnsAction_0); setId(DebugUIPlugin.getUniqueIdentifier() + ".ConfigureColumnsAction"); //$NON-NLS-1$ PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.CONFIGURE_COLUMNS_ACTION); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/RemoveExpressionAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/RemoveExpressionAction.java index 603f5a68c..4382ccbae 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/RemoveExpressionAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/RemoveExpressionAction.java @@ -34,7 +34,7 @@ public class RemoveExpressionAction extends AbstractRemoveActionDelegate { List expressions = new ArrayList(); for (int i = paths.length-1; i >=0; i--) { TreePath path = paths[i]; - Object segment = path.getSegment(1); + Object segment = path.getFirstSegment(); if (segment instanceof IExpression) { expressions.add(segment); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueAction.java index 81bf9f4a0..2b5adc348 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueAction.java @@ -46,7 +46,7 @@ public class ChangeVariableValueAction extends SelectionProviderAction { /** * Creates a new ChangeVariableValueAction for the given variables view - * @param view the varibles view in which this action will appear + * @param view the variables view in which this action will appear */ public ChangeVariableValueAction(VariablesView view) { super(view.getViewer(), ActionMessages.ChangeVariableValue_title); @@ -61,7 +61,7 @@ public class ChangeVariableValueAction extends SelectionProviderAction { } /** - * Edit the variable value with an inline text editor. + * Edit the variable value with an in-line text editor. */ protected void doActionPerformed(final IVariable variable) { Shell shell = fView.getViewSite().getShell(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/DebugModelPresentationContext.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/DebugModelPresentationContext.java new file mode 100644 index 000000000..5b4f63d85 --- /dev/null +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/DebugModelPresentationContext.java @@ -0,0 +1,41 @@ +/******************************************************************************* + * Copyright (c) 2006 IBM Corporation 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: + * IBM Corporation - initial API and implementation + *******************************************************************************/ +package org.eclipse.debug.internal.ui.views; + +import org.eclipse.debug.internal.ui.viewers.model.provisional.PresentationContext; +import org.eclipse.debug.ui.IDebugModelPresentation; + +/** + * A presentation context that has a debug model presentation. + * + * @since 3.3 + */ +public class DebugModelPresentationContext extends PresentationContext { + + private IDebugModelPresentation fPresentation; + + /** + * Constructs a presentation context for the given id using the + * specified model presentation. + * + * @param id context id + * @param presentation debug model presentation + */ + public DebugModelPresentationContext(String id, IDebugModelPresentation presentation) { + super(id); + fPresentation = presentation; + } + + public IDebugModelPresentation getModelPresentation() { + return fPresentation; + } + +} diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionView.java index 0323f7e49..f5210e4d2 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionView.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionView.java @@ -15,11 +15,9 @@ import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.model.IDebugElement; import org.eclipse.debug.internal.ui.IDebugHelpContextIds; import org.eclipse.debug.internal.ui.preferences.IDebugPreferenceConstants; -import org.eclipse.debug.internal.ui.views.AbstractViewerState; import org.eclipse.debug.internal.ui.views.variables.AvailableLogicalStructuresAction; import org.eclipse.debug.internal.ui.views.variables.VariablesView; import org.eclipse.debug.internal.ui.views.variables.VariablesViewMessages; -import org.eclipse.debug.internal.ui.views.variables.VariablesViewer; import org.eclipse.debug.ui.IDebugUIConstants; import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.IMenuManager; @@ -29,7 +27,6 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.IWorkbenchActionConstants; /** @@ -38,8 +35,6 @@ import org.eclipse.ui.IWorkbenchActionConstants; */ public class ExpressionView extends VariablesView { - private AbstractViewerState fState; - /** * @see AbstractDebugView#getHelpContextId() */ @@ -75,7 +70,8 @@ public class ExpressionView extends VariablesView { menu.add(new Separator(IDebugUIConstants.EMPTY_EXPRESSION_GROUP)); menu.add(new Separator(IDebugUIConstants.EXPRESSION_GROUP)); - menu.add(getAction(FIND_ELEMENT)); + // TODO: + //menu.add(getAction(FIND_ELEMENT)); menu.add(getAction("ChangeVariableValue")); //$NON-NLS-1$ IAction action = new AvailableLogicalStructuresAction(this); if (action.isEnabled()) { @@ -84,7 +80,7 @@ public class ExpressionView extends VariablesView { menu.add(new Separator(IDebugUIConstants.EMPTY_RENDER_GROUP)); menu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS)); } - + protected void contextActivated(ISelection selection) { if (!isVisible()) { return; @@ -127,53 +123,26 @@ public class ExpressionView extends VariablesView { } /* (non-Javadoc) - * @see org.eclipse.debug.ui.AbstractDebugView#createActions() + * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#becomesVisible() */ - protected void createActions() { - super.createActions(); + protected void becomesVisible() { setInitialContent(); + super.becomesVisible(); } - - /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#restoreState() - */ - protected void restoreState() { - if (fState != null) { - fState.restoreState(getVariablesViewer()); - } - } /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#dispose() - */ - public void dispose() { - super.dispose(); - fState = null; - } - - /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#becomesHidden() + * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#getViewerStyle() */ - protected void becomesHidden() { - fState = getViewerState(); - super.becomesHidden(); - getViewer().setInput(null); + protected int getViewerStyle() { + return SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL | SWT.VIRTUAL; } /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#becomesVisible() - */ - protected void becomesVisible() { - super.becomesVisible(); - setInitialContent(); - restoreState(); - } - - /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#createVariablesViewer(org.eclipse.swt.widgets.Composite) + * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#getPresentationContextId() */ - protected VariablesViewer createVariablesViewer(Composite parent) { - return new VariablesViewer(parent, SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL | SWT.VIRTUAL, this); + protected String getPresentationContextId() { + return IDebugUIConstants.ID_EXPRESSION_VIEW; } + } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java index d53162a62..fe8184735 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java @@ -489,10 +489,6 @@ public class LaunchView extends AbstractDebugView implements ISelectionChangedLi fProvider.activate(event.getSelection()); updateObjects(); } - - protected void possibleContextChange(Object element, int type) { - // TODO: remove - } /* (non-Javadoc) * @see org.eclipse.jface.viewers.IDoubleClickListener#doubleClick(org.eclipse.jface.viewers.DoubleClickEvent) @@ -611,12 +607,12 @@ public class LaunchView extends AbstractDebugView implements ISelectionChangedLi } /** - * Updates the enablement of the given action based on the selection - * and addes to the menu iff enabled. + * Updates the enabled state of the given action based on the selection + * and adds to the menu if enabled. * * @param menu menu to add the action to * @param action action to add if enabled - * @param selection selection to update enablement + * @param selection selection to update enabled state for */ private void updateAndAdd(IMenuManager menu, SelectionListenerAction action, IStructuredSelection selection) { action.selectionChanged(selection); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewUpdatePolicy.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewUpdatePolicy.java deleted file mode 100644 index e35dcf65a..000000000 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewUpdatePolicy.java +++ /dev/null @@ -1,59 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005, 2006 IBM Corporation 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: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.debug.internal.ui.views.launch; - -import org.eclipse.debug.internal.ui.viewers.AsynchronousTreeViewer; -import org.eclipse.debug.internal.ui.viewers.TreeUpdatePolicy; -import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta; -import org.eclipse.debug.ui.contexts.DebugContextEvent; - -/** - * @since 3.2 - * - */ -public class LaunchViewUpdatePolicy extends TreeUpdatePolicy { - - private LaunchView fView = null; - - public LaunchViewUpdatePolicy(LaunchView view) { - fView = view; - } - - /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.viewers.update.AbstractUpdatePolicy#dispose() - */ - public synchronized void dispose() { - super.dispose(); - fView = null; - } - - /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.viewers.update.DefaultUpdatePolicy#handleState(org.eclipse.debug.internal.ui.viewers.AsynchronousTreeModelViewer, org.eclipse.debug.internal.ui.viewers.IModelDelta) - */ - protected void handleState(AsynchronousTreeViewer viewer, IModelDelta delta) { - super.handleState(viewer, delta); - if ((delta.getFlags() & (IModelDelta.CONTENT | IModelDelta.SELECT)) == 0) { - // a state change without content or selection is a possible context change - fView.possibleContextChange(delta.getElement(), DebugContextEvent.STATE); - } - } - - protected void handleContent(AsynchronousTreeViewer viewer, IModelDelta delta) { - super.handleContent(viewer, delta); - if ((delta.getFlags() & IModelDelta.SELECT) == 0) { - // a content change without select or selection is a possible activation - fView.possibleContextChange(delta.getElement(), DebugContextEvent.ACTIVATED); - } - } - - - -} diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewer.java deleted file mode 100644 index 15af8ba82..000000000 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewer.java +++ /dev/null @@ -1,50 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2006 IBM Corporation 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: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.debug.internal.ui.views.launch; - -import org.eclipse.debug.internal.ui.viewers.AbstractUpdatePolicy; -import org.eclipse.debug.internal.ui.viewers.AsynchronousModel; -import org.eclipse.debug.internal.ui.viewers.AsynchronousTreeViewer; -import org.eclipse.swt.widgets.Composite; - -public class LaunchViewer extends AsynchronousTreeViewer { - - private LaunchView fView; - - public LaunchViewer(Composite parent, LaunchView view) { - super(parent); - fView = view; - } - - /* (non-Javadoc) - * @see org.eclipse.debug.ui.viewers.AsynchronousViewer#isSuppressEqualSelections() - */ - protected boolean isSuppressEqualSelections() { - // fire activation changes all the time - return false; - } - - /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.viewers.AsynchronousModelViewer#createUpdatePolicy() - */ - public AbstractUpdatePolicy createUpdatePolicy() { - return new LaunchViewUpdatePolicy(fView); - } - - /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.viewers.AsynchronousModelViewer#createModel() - */ - protected AsynchronousModel createModel() { - return new LaunchTreeModel(this); - } - -} diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTreeViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTreeViewer.java index 6001b2e59..380837527 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTreeViewer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTreeViewer.java @@ -16,9 +16,9 @@ import org.eclipse.debug.core.model.IMemoryBlock; import org.eclipse.debug.core.model.IMemoryBlockRetrieval; import org.eclipse.debug.internal.ui.viewers.AbstractUpdatePolicy; import org.eclipse.debug.internal.ui.viewers.AsynchronousTreeViewer; +import org.eclipse.debug.internal.ui.viewers.PartPresentationContext; import org.eclipse.debug.internal.ui.viewers.TreeUpdatePolicy; -import org.eclipse.debug.internal.ui.viewers.provisional.IModelDelta; -import org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext; +import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta; import org.eclipse.swt.widgets.Composite; /** @@ -53,7 +53,7 @@ public class MemoryViewTreeViewer extends AsynchronousTreeViewer { { if ((flags & IModelDelta.SELECT) != 0) { - IPresentationContext context = getViewer().getPresentationContext(); + PartPresentationContext context = (PartPresentationContext) getViewer().getPresentationContext(); if (context.getPart() instanceof MemoryView) { MemoryView view = (MemoryView)context.getPart(); @@ -97,7 +97,7 @@ public class MemoryViewTreeViewer extends AsynchronousTreeViewer { if ((flags & IModelDelta.REPLACED) != 0) { } - updateNodes(node.getNodes()); + updateNodes(node.getChildDeltas()); } } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingUpdatePolicy.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingUpdatePolicy.java index 019db8882..8d5056a30 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingUpdatePolicy.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingUpdatePolicy.java @@ -21,8 +21,9 @@ import org.eclipse.debug.core.model.IMemoryBlockExtension; import org.eclipse.debug.internal.ui.memory.provisional.AbstractAsyncTableRendering; import org.eclipse.debug.internal.ui.memory.provisional.MemoryViewPresentationContext; import org.eclipse.debug.internal.ui.viewers.TableUpdatePolicy; -import org.eclipse.debug.internal.ui.viewers.provisional.IModelChangedListener; -import org.eclipse.debug.internal.ui.viewers.provisional.IModelDelta; +import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelChangedListener; +import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta; +import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelProxy; import org.eclipse.debug.ui.memory.IMemoryRendering; import org.eclipse.ui.progress.UIJob; @@ -34,7 +35,7 @@ import org.eclipse.ui.progress.UIJob; */ public class AsyncTableRenderingUpdatePolicy extends TableUpdatePolicy { - public void modelChanged(IModelDelta node) { + public void modelChanged(IModelDelta node, IModelProxy proxy) { // clear current cache as it becomes invalid when the memory block is changed AbstractVirtualContentTableModel model = getTableViewer().getVirtualContentModel(); @@ -67,7 +68,7 @@ public class AsyncTableRenderingUpdatePolicy extends TableUpdatePolicy // update policy figured out what's changed in the memory block // and will tell rendering to update accordinly. // Updating the rendering indirectly update the table viewer - notifyRendering(node); + notifyRendering(node, proxy); handleMemoryBlockChanged((IMemoryBlock)node.getElement(), node); return; @@ -81,7 +82,7 @@ public class AsyncTableRenderingUpdatePolicy extends TableUpdatePolicy } } - super.modelChanged(node); + super.modelChanged(node, proxy); } /** @@ -92,12 +93,12 @@ public class AsyncTableRenderingUpdatePolicy extends TableUpdatePolicy computer.clearCache(); } - private void notifyRendering(IModelDelta node) { + private void notifyRendering(IModelDelta node, IModelProxy proxy) { if (getTableViewer() != null) { IModelChangedListener listener = (IModelChangedListener)getTableViewer().getRendering().getAdapter(IModelChangedListener.class); if (listener != null) - listener.modelChanged(node); + listener.modelChanged(node, proxy); } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingViewer.java index d03da6b65..80539f846 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingViewer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingViewer.java @@ -1027,7 +1027,7 @@ public class AsyncTableRenderingViewer extends AsyncVirtualContentTableViewer { } /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousViewer#getModel() + * @see org.eclipse.debug.internal.ui.viewers.model.provisional.viewers.AsynchronousViewer#getModel() */ public AsynchronousModel getModel() { return super.getModel(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/registers/RegistersView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/registers/RegistersView.java index e11798a03..acee47c8e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/registers/RegistersView.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/registers/RegistersView.java @@ -51,5 +51,12 @@ public class RegistersView extends VariablesView { protected String getToggleActionLabel() { return RegistersViewMessages.RegistersView_0; } + + /* (non-Javadoc) + * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#getPresentationContextId() + */ + protected String getPresentationContextId() { + return IDebugUIConstants.ID_REGISTER_VIEW; + } } |