From 1e1e66689e2f0ddc0fffb41649f32fcd3c78d96c Mon Sep 17 00:00:00 2001
From: Pawel Piech <pawel.piech@windriver.com>
Date: Thu, 13 Mar 2008 19:04:07 +0000
Subject: [PATCH] [220446] Updated the timers example.

---
 .../eclipse/dd/examples/dsf/timers/AlarmService.java   | 10 +++++-----
 .../eclipse/dd/examples/dsf/timers/AlarmsVMNode.java   |  8 ++++----
 .../eclipse/dd/examples/dsf/timers/TimerService.java   |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/plugins/org.eclipse.dd.examples.dsf/src/org/eclipse/dd/examples/dsf/timers/AlarmService.java b/plugins/org.eclipse.dd.examples.dsf/src/org/eclipse/dd/examples/dsf/timers/AlarmService.java
index 830580c4e57..1a48ba43113 100644
--- a/plugins/org.eclipse.dd.examples.dsf/src/org/eclipse/dd/examples/dsf/timers/AlarmService.java
+++ b/plugins/org.eclipse.dd.examples.dsf/src/org/eclipse/dd/examples/dsf/timers/AlarmService.java
@@ -107,8 +107,8 @@ public class AlarmService extends AbstractDsfService
     /**
      * Event indicating that an alarm has been triggered by a timer. 
      */
-    public class AlarmTriggeredEvent extends AbstractDMEvent<AlarmDMContext> {
-        public AlarmTriggeredEvent(AlarmDMContext context) {
+    public class AlarmTriggeredDMEvent extends AbstractDMEvent<AlarmDMContext> {
+        public AlarmTriggeredDMEvent(AlarmDMContext context) {
             super(context);
         }
     }
@@ -123,7 +123,7 @@ public class AlarmService extends AbstractDsfService
     
     @Override 
     protected BundleContext getBundleContext() {
-        return DsfExamplesPlugin.getBundleContext();
+        return DsfExamplesPlugin.getDefault().getBundle().getBundleContext();
     }    
 
     @Override 
@@ -179,7 +179,7 @@ public class AlarmService extends AbstractDsfService
                 AlarmDMContext alarmCtx = new AlarmDMContext(
                     getSession().getId(), timerContext, entry.getKey());
                 getSession().dispatchEvent( 
-                    new AlarmTriggeredEvent(alarmCtx), getProperties());
+                    new AlarmTriggeredDMEvent(alarmCtx), getProperties());
             }
         }
     }
@@ -201,7 +201,7 @@ public class AlarmService extends AbstractDsfService
     }
 
     /** Returns the alarm context for given timer and trigger contexts. */
-    public AlarmDMContext getAlarmS(TriggerDMContext alarmCtx, TimerDMContext timerCtx) {
+    public AlarmDMContext getAlarm(TriggerDMContext alarmCtx, TimerDMContext timerCtx) {
         return new AlarmDMContext(getSession().getId(), timerCtx, alarmCtx);
     }
 
diff --git a/plugins/org.eclipse.dd.examples.dsf/src/org/eclipse/dd/examples/dsf/timers/AlarmsVMNode.java b/plugins/org.eclipse.dd.examples.dsf/src/org/eclipse/dd/examples/dsf/timers/AlarmsVMNode.java
index 3f86a7825c3..3cc08f4ce3c 100644
--- a/plugins/org.eclipse.dd.examples.dsf/src/org/eclipse/dd/examples/dsf/timers/AlarmsVMNode.java
+++ b/plugins/org.eclipse.dd.examples.dsf/src/org/eclipse/dd/examples/dsf/timers/AlarmsVMNode.java
@@ -60,7 +60,7 @@ class AlarmsVMNode extends AbstractDMVMNode
         
         // Get the alarm context then check the triggered value.  
         final AlarmDMContext alarmStatusDmc = getServicesTracker().getService(AlarmService.class).
-            getAlarmS(alarmDmc, timerDmc);
+            getAlarm(alarmDmc, timerDmc);
         boolean triggered = getServicesTracker().getService(AlarmService.class).
             isAlarmTriggered(alarmStatusDmc); 
         
@@ -84,7 +84,7 @@ class AlarmsVMNode extends AbstractDMVMNode
     
     
     public int getDeltaFlags(Object e) {
-        if (e instanceof AlarmService.AlarmTriggeredEvent) {
+        if (e instanceof AlarmService.AlarmTriggeredDMEvent) {
             return IModelDelta.ADDED | IModelDelta.SELECT | IModelDelta.EXPAND;
         }
         return IModelDelta.NO_CHANGE;
@@ -93,10 +93,10 @@ class AlarmsVMNode extends AbstractDMVMNode
     public void buildDelta(Object e, VMDelta parentDelta, int nodeOffset, RequestMonitor requestMonitor) {
         // The alarm element is added when and selected upon a triggered event.  
         // Parent element is also expanded allow the alarm to be selected.
-        if (e instanceof AlarmService.AlarmTriggeredEvent) {
+        if (e instanceof AlarmService.AlarmTriggeredDMEvent) {
             parentDelta.setFlags(parentDelta.getFlags() | IModelDelta.EXPAND);
             parentDelta.addNode(
-                createVMContext( ((AlarmService.AlarmTriggeredEvent)e).getDMContext() ),
+                createVMContext( ((AlarmService.AlarmTriggeredDMEvent)e).getDMContext() ),
                 0,
                 IModelDelta.ADDED | IModelDelta.SELECT);
         }
diff --git a/plugins/org.eclipse.dd.examples.dsf/src/org/eclipse/dd/examples/dsf/timers/TimerService.java b/plugins/org.eclipse.dd.examples.dsf/src/org/eclipse/dd/examples/dsf/timers/TimerService.java
index 1ab01d63d93..ab2ab106d4c 100644
--- a/plugins/org.eclipse.dd.examples.dsf/src/org/eclipse/dd/examples/dsf/timers/TimerService.java
+++ b/plugins/org.eclipse.dd.examples.dsf/src/org/eclipse/dd/examples/dsf/timers/TimerService.java
@@ -100,7 +100,7 @@ public class TimerService extends AbstractDsfService
     
     @Override 
     protected BundleContext getBundleContext() {
-        return DsfExamplesPlugin.getBundleContext();
+        return DsfExamplesPlugin.getDefault().getBundle().getBundleContext();
     }    
 
     @Override