From cad5eca6bdc5ed7593fb2472ea165da47395d4c7 Mon Sep 17 00:00:00 2001
From: Marc Khouzam <marc.khouzam@ericsson.com>
Date: Thu, 8 Nov 2007 19:42:02 +0000
Subject: [PATCH] Updated to use the standard pattern for request monitors

---
 .../dd/dsf/ui/viewmodel/update/VMCache.java   | 33 +++----------------
 1 file changed, 5 insertions(+), 28 deletions(-)

diff --git a/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/update/VMCache.java b/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/update/VMCache.java
index 224cde67366..ec6438f0727 100644
--- a/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/update/VMCache.java
+++ b/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/update/VMCache.java
@@ -16,7 +16,6 @@ import java.util.List;
 import java.util.Vector;
 import java.util.concurrent.Executor;
 
-import org.eclipse.core.runtime.IStatus;
 import org.eclipse.dd.dsf.concurrent.ConfinedToDsfExecutor;
 import org.eclipse.dd.dsf.concurrent.DataRequestMonitor;
 import org.eclipse.dd.dsf.concurrent.DefaultDsfExecutor;
@@ -358,36 +357,14 @@ public abstract class VMCache
     	else
     	{
 	    	service.getModelData(dmc, 
-	    		new DataRequestMonitor<IDMData>(executor, null) {
+	    		new DataRequestMonitor<IDMData>(executor, rm) {
 		            @Override
-					protected void handleCompleted() {
-		            	if(getStatus().isOK())
-		            	{
-		            		if(isCacheWriteEnabled())
-			            		fData.put(dmc, getData());
-			            	rm.setData(getData());
-		            	}
+					protected void handleOK() {
+		            	if(isCacheWriteEnabled())
+		            		fData.put(dmc, getData());
+		            	rm.setData(getData());
 	    				rm.done();
 					}
-
-					@Override
-					public synchronized void setCanceled(boolean canceled) {
-						rm.setCanceled(canceled);
-						super.setCanceled(canceled);
-					}
-
-					@Override
-					public void setMultiStatus(String pluginId, int code,
-							String message, IStatus subStatus) {
-						rm.setMultiStatus(pluginId, code, message, subStatus);
-						super.setMultiStatus(pluginId, code, message, subStatus);
-					}
-
-					@Override
-					public synchronized void setStatus(IStatus status) {
-						rm.setStatus(status);
-						super.setStatus(status);
-					}
 		        }		
 	    	);
     	}