From b575779a66cf790e924b15aa1de5a92021c944e4 Mon Sep 17 00:00:00 2001
From: Ted Williams <ted@ted.net>
Date: Fri, 26 Sep 2008 22:44:37 +0000
Subject: [PATCH] [248799] [memory] update mode support fails with multiple
 view instances

---
 .../org.eclipse.dd.dsf.debug.ui/plugin.xml    | 30 -------------------
 .../ui/memory/SelectUpdatePolicyAction.java   | 16 +---------
 2 files changed, 1 insertion(+), 45 deletions(-)

diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/plugin.xml b/plugins/org.eclipse.dd.dsf.debug.ui/plugin.xml
index 5f94dac91d1..efb9eb771c6 100644
--- a/plugins/org.eclipse.dd.dsf.debug.ui/plugin.xml
+++ b/plugins/org.eclipse.dd.dsf.debug.ui/plugin.xml
@@ -555,36 +555,6 @@
    
       
    <!-- 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
          point="org.eclipse.ui.viewActions">
     <viewContribution
diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/memory/SelectUpdatePolicyAction.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/memory/SelectUpdatePolicyAction.java
index 16761ca41a3..ecf1d347993 100644
--- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/memory/SelectUpdatePolicyAction.java
+++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/memory/SelectUpdatePolicyAction.java
@@ -39,8 +39,6 @@ public class SelectUpdatePolicyAction implements IMenuCreator, IViewActionDelega
 
 	private IAction fAction = null;
     private IMemoryBlock fMemoryBlock = null;
-    
-    private String fUpdatePolicy = null;
 	
     public void dispose() {
 		// do nothing
@@ -69,7 +67,6 @@ public class SelectUpdatePolicyAction implements IMenuCreator, IViewActionDelega
 		@Override
 		public void run() {
             ((IMemoryBlockUpdatePolicyProvider) fMemoryBlock).setUpdatePolicy(fID);
-            fUpdatePolicy = fID;
         }
     
     }
@@ -111,18 +108,6 @@ public class SelectUpdatePolicyAction implements IMenuCreator, IViewActionDelega
     			action.setMenuCreator(this);
     			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]));
 		    	ActionContributionItem item = new ActionContributionItem(action);
 		    	action.setChecked(policies[i].equals(currentPolicy));
+		    	
 		    	item.fill(menu, -1);
     		}
     	}