From 2eeb644c2fb0fe2213de10df5cc140a6653bcd03 Mon Sep 17 00:00:00 2001
From: Marc Khouzam <marc.khouzam@ericsson.com>
Date: Wed, 26 Mar 2008 14:21:03 +0000
Subject: [PATCH] Fix compilation after commit for Bug 179293

---
 .../eclipse/dd/examples/pda/service/PDABreakpoints.java   | 8 ++++----
 .../eclipse/dd/examples/pda/service/PDARunControl.java    | 6 +++---
 .../dd/gdb/internal/ui/viewmodel/GdbViewModelAdapter.java | 3 ++-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/plugins/org.eclipse.dd.examples.pda/src/org/eclipse/dd/examples/pda/service/PDABreakpoints.java b/plugins/org.eclipse.dd.examples.pda/src/org/eclipse/dd/examples/pda/service/PDABreakpoints.java
index 5e4b733ea96..6d56ff522fc 100644
--- a/plugins/org.eclipse.dd.examples.pda/src/org/eclipse/dd/examples/pda/service/PDABreakpoints.java
+++ b/plugins/org.eclipse.dd.examples.pda/src/org/eclipse/dd/examples/pda/service/PDABreakpoints.java
@@ -253,11 +253,11 @@ public class PDABreakpoints extends AbstractDsfService implements IBreakpoints
                 }
 
                 @Override
-                protected void handleCancelOrErrorOrWarning() {
+                protected void handleNotOK() {
                     // If inserting of the breakpoint failed, remove it from
                     // the set of installed breakpoints.
                     fBreakpoints.remove(breakpointCtx);
-                    super.handleCancelOrErrorOrWarning();
+                    super.handleNotOK();
                 }
             });
     }
@@ -319,11 +319,11 @@ public class PDABreakpoints extends AbstractDsfService implements IBreakpoints
                 }
 
                 @Override
-                protected void handleCancelOrErrorOrWarning() {
+                protected void handleNotOK() {
                     // Since the command failed, we need to remove the breakpoint from 
                     // the existing breakpoint set.
                     fBreakpoints.remove(watchpointCtx);
-                    super.handleCancelOrErrorOrWarning();
+                    super.handleNotOK();
                 }
             });
     }
diff --git a/plugins/org.eclipse.dd.examples.pda/src/org/eclipse/dd/examples/pda/service/PDARunControl.java b/plugins/org.eclipse.dd.examples.pda/src/org/eclipse/dd/examples/pda/service/PDARunControl.java
index 02462870cbe..5457e57efb6 100644
--- a/plugins/org.eclipse.dd.examples.pda/src/org/eclipse/dd/examples/pda/service/PDARunControl.java
+++ b/plugins/org.eclipse.dd.examples.pda/src/org/eclipse/dd/examples/pda/service/PDARunControl.java
@@ -244,11 +244,11 @@ public class PDARunControl extends AbstractDsfService
             	new PDAResumeCommand(fCommandControl.getProgramDMContext()),
             	new DataRequestMonitor<PDACommandResult>(getExecutor(), rm) { 
                     @Override
-                    protected void handleCancelOrErrorOrWarning() {
+                    protected void handleNotOK() {
                         // If the resume command failed, we no longer
                         // expect to receive a resumed event.
                         fResumePending = false;
-                        super.handleCancelOrErrorOrWarning();
+                        super.handleNotOK();
                     }
             	}
             );
@@ -285,7 +285,7 @@ public class PDARunControl extends AbstractDsfService
                 new PDAStepCommand(fCommandControl.getProgramDMContext()),
                 new DataRequestMonitor<PDACommandResult>(getExecutor(), rm) {
                     @Override
-                    protected void handleCancelOrErrorOrWarning() {
+                    protected void handleNotOK() {
                         // If the step command failed, we no longer
                         // expect to receive a resumed event.
                         fResumePending = false;
diff --git a/plugins/org.eclipse.dd.gdb.ui/src/org/eclipse/dd/gdb/internal/ui/viewmodel/GdbViewModelAdapter.java b/plugins/org.eclipse.dd.gdb.ui/src/org/eclipse/dd/gdb/internal/ui/viewmodel/GdbViewModelAdapter.java
index 07f6ff34b33..a8f003eddf0 100644
--- a/plugins/org.eclipse.dd.gdb.ui/src/org/eclipse/dd/gdb/internal/ui/viewmodel/GdbViewModelAdapter.java
+++ b/plugins/org.eclipse.dd.gdb.ui/src/org/eclipse/dd/gdb/internal/ui/viewmodel/GdbViewModelAdapter.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.dd.gdb.internal.ui.viewmodel;
 
+import org.eclipse.cdt.debug.ui.ICDebugUIConstants;
 import org.eclipse.dd.dsf.concurrent.ThreadSafe;
 import org.eclipse.dd.dsf.debug.ui.viewmodel.expression.ExpressionVMProvider;
 import org.eclipse.dd.dsf.debug.ui.viewmodel.modules.ModulesVMProvider;
@@ -51,7 +52,7 @@ public class GdbViewModelAdapter extends AbstractDMVMAdapter
             return new RegisterVMProvider(this, context, getSession());
         } else if (IDebugUIConstants.ID_EXPRESSION_VIEW.equals(context.getId()) ) {
             return new ExpressionVMProvider(this, context, getSession());
-        } else if (IDebugUIConstants.ID_MODULE_VIEW.equals(context.getId()) ) {
+        } else if (ICDebugUIConstants.ID_MODULES_VIEW.equals(context.getId()) ) {
             return new ModulesVMProvider(this, context, getSession());
         }
         return null;