mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-17 05:55:22 +02:00
[248799] [memory] update mode support fails with multiple view instances
This commit is contained in:
parent
7d97e3d053
commit
b575779a66
2 changed files with 1 additions and 45 deletions
|
@ -555,36 +555,6 @@
|
||||||
|
|
||||||
|
|
||||||
<!-- memory update policy -->
|
<!-- memory update policy -->
|
||||||
<extension point="org.eclipse.ui.popupMenus">
|
|
||||||
<viewerContribution
|
|
||||||
id="org.eclipse.debug.ui.MemoryView.updatePolicy"
|
|
||||||
targetID="org.eclipse.debug.ui.MemoryView.MemoryBlocksTreeViewPane">
|
|
||||||
<action
|
|
||||||
class="org.eclipse.dd.dsf.debug.internal.provisional.ui.memory.SelectUpdatePolicyAction"
|
|
||||||
id="org.eclipse.debug.ui.views.memory.update.selectUpdatePolicy"
|
|
||||||
label="Update Policy"
|
|
||||||
menubarPath="additions">
|
|
||||||
</action>
|
|
||||||
</viewerContribution>
|
|
||||||
<viewerContribution
|
|
||||||
targetID="org.eclipse.debug.ui.MemoryView.RenderingViewPane.2"
|
|
||||||
id="org.eclipse.debug.ui.memory.renderingviewpane.2.updatepolicy">
|
|
||||||
<action
|
|
||||||
label="Update Policy"
|
|
||||||
class="org.eclipse.dd.dsf.debug.internal.provisional.ui.memory.SelectUpdatePolicyAction"
|
|
||||||
menubarPath="org.eclipse.debug.ui.memory.renderingviewpane.2"
|
|
||||||
id="org.eclipse.debug.ui.MemoryView.RenderingViewPane.2.updatepolicy"/>
|
|
||||||
</viewerContribution>
|
|
||||||
<viewerContribution
|
|
||||||
targetID="org.eclipse.debug.ui.MemoryView.RenderingViewPane.1"
|
|
||||||
id="org.eclipse.debug.ui.memory.renderingviewpane.1.updatepolicy">
|
|
||||||
<action
|
|
||||||
label="Update Policy"
|
|
||||||
class="org.eclipse.dd.dsf.debug.internal.provisional.ui.memory.SelectUpdatePolicyAction"
|
|
||||||
menubarPath="org.eclipse.debug.ui.memory.renderingviewpane.1"
|
|
||||||
id="org.eclipse.debug.ui.MemoryView.RenderingViewPane.1.updatepolicy"/>
|
|
||||||
</viewerContribution>
|
|
||||||
</extension>
|
|
||||||
<extension
|
<extension
|
||||||
point="org.eclipse.ui.viewActions">
|
point="org.eclipse.ui.viewActions">
|
||||||
<viewContribution
|
<viewContribution
|
||||||
|
|
|
@ -40,8 +40,6 @@ public class SelectUpdatePolicyAction implements IMenuCreator, IViewActionDelega
|
||||||
private IAction fAction = null;
|
private IAction fAction = null;
|
||||||
private IMemoryBlock fMemoryBlock = null;
|
private IMemoryBlock fMemoryBlock = null;
|
||||||
|
|
||||||
private String fUpdatePolicy = null;
|
|
||||||
|
|
||||||
public void dispose() {
|
public void dispose() {
|
||||||
// do nothing
|
// do nothing
|
||||||
|
|
||||||
|
@ -69,7 +67,6 @@ public class SelectUpdatePolicyAction implements IMenuCreator, IViewActionDelega
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
((IMemoryBlockUpdatePolicyProvider) fMemoryBlock).setUpdatePolicy(fID);
|
((IMemoryBlockUpdatePolicyProvider) fMemoryBlock).setUpdatePolicy(fID);
|
||||||
fUpdatePolicy = fID;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -111,18 +108,6 @@ public class SelectUpdatePolicyAction implements IMenuCreator, IViewActionDelega
|
||||||
action.setMenuCreator(this);
|
action.setMenuCreator(this);
|
||||||
action.setEnabled(true);
|
action.setEnabled(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(fMemoryBlock != null)
|
|
||||||
{
|
|
||||||
if(fMemoryBlock instanceof IMemoryBlockUpdatePolicyProvider)
|
|
||||||
{
|
|
||||||
String currentPolicy = ((IMemoryBlockUpdatePolicyProvider) fMemoryBlock).getUpdatePolicy();
|
|
||||||
if(fUpdatePolicy == null)
|
|
||||||
fUpdatePolicy = currentPolicy;
|
|
||||||
|
|
||||||
((IMemoryBlockUpdatePolicyProvider) fMemoryBlock).setUpdatePolicy(fUpdatePolicy);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -158,6 +143,7 @@ public class SelectUpdatePolicyAction implements IMenuCreator, IViewActionDelega
|
||||||
SelectPolicy action = new SelectPolicy(policies[i], blockPolicy.getUpdatePolicyDescription(policies[i]));
|
SelectPolicy action = new SelectPolicy(policies[i], blockPolicy.getUpdatePolicyDescription(policies[i]));
|
||||||
ActionContributionItem item = new ActionContributionItem(action);
|
ActionContributionItem item = new ActionContributionItem(action);
|
||||||
action.setChecked(policies[i].equals(currentPolicy));
|
action.setChecked(policies[i].equals(currentPolicy));
|
||||||
|
|
||||||
item.fill(menu, -1);
|
item.fill(menu, -1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue