From 204b65416f468138205fd3112505c7f7306c6fc3 Mon Sep 17 00:00:00 2001
From: Ken Gilmer <kgilmer@gmail.com>
Date: Thu, 4 Aug 2011 14:16:54 +0900
Subject: [PATCH] dragonfly: fix jet template code generator and attempt to add
 bug.simulator to eclipse plugins.

---
 com.buglabs.dragonfly.feature/feature.xml                  | 7 +++++++
 .../com/buglabs/dragonfly/generators/jet/Activator.java    | 4 ++--
 com.buglabs.dragonfly.generators/templates/Activator.jet   | 4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/com.buglabs.dragonfly.feature/feature.xml b/com.buglabs.dragonfly.feature/feature.xml
index 723c4f3..be9b92f 100644
--- a/com.buglabs.dragonfly.feature/feature.xml
+++ b/com.buglabs.dragonfly.feature/feature.xml
@@ -340,4 +340,11 @@ GLGPL-licenced code is included as a part of the BUG Simulator.  The license for
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="com.buglabs.bug.simulator"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/com.buglabs.dragonfly.generators/src/com/buglabs/dragonfly/generators/jet/Activator.java b/com.buglabs.dragonfly.generators/src/com/buglabs/dragonfly/generators/jet/Activator.java
index 2f26ee0..bfeb2f2 100644
--- a/com.buglabs.dragonfly.generators/src/com/buglabs/dragonfly/generators/jet/Activator.java
+++ b/com.buglabs.dragonfly.generators/src/com/buglabs/dragonfly/generators/jet/Activator.java
@@ -33,7 +33,7 @@ public static synchronized Activator create(String lineSeparator)
   protected final String TEXT_15 = ".class.getName(),";
   protected final String TEXT_16 = NL + "\t};";
   protected final String TEXT_17 = "\t" + NL + "\tprivate ServiceTracker serviceTracker;" + NL + "\t" + NL + "\t/*" + NL + "\t * (non-Javadoc)" + NL + "\t * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)" + NL + "\t */" + NL + "\tpublic void start(BundleContext context) throws Exception {";
-  protected final String TEXT_18 = NL + "\t\tserviceTracker = ServiceTrackerUtil.openServiceTracker(context, new ServiceTrackerUtil.ManagedInlineRunnable() {" + NL + "\t\t\t" + NL + "\t\t\t@Override" + NL + "\t\t\tpublic void run(Map<Object, Object> services) {";
+  protected final String TEXT_18 = NL + "\t\tserviceTracker = ServiceTrackerUtil.openServiceTracker(context, new ServiceTrackerUtil.ManagedInlineRunnable() {" + NL + "\t\t\t" + NL + "\t\t\t@Override" + NL + "\t\t\tpublic void run(Map<String, Object> services) {";
   protected final String TEXT_19 = "\t\t\t" + NL + "\t\t\t\t";
   protected final String TEXT_20 = " ";
   protected final String TEXT_21 = " = (";
@@ -48,7 +48,7 @@ public static synchronized Activator create(String lineSeparator)
   protected final String TEXT_30 = ".class.getName(), ";
   protected final String TEXT_31 = ");" + NL + "\t    ";
   protected final String TEXT_32 = NL;
-  protected final String TEXT_33 = NL + "\t\tserviceTracker = ServiceTrackerUtil.openServiceTracker(context, getServiceNames(serviceMap), createFilter(context, serviceMap), new ServiceTrackerUtil.ManagedInlineRunnable() {" + NL + "\t\t\t" + NL + "\t\t\t@Override" + NL + "\t\t\tpublic void run(Map<Object, Object> services) {";
+  protected final String TEXT_33 = NL + "\t\tserviceTracker = ServiceTrackerUtil.openServiceTracker(context, getServiceNames(serviceMap), createFilter(context, serviceMap), new ServiceTrackerUtil.ManagedInlineRunnable() {" + NL + "\t\t\t" + NL + "\t\t\t@Override" + NL + "\t\t\tpublic void run(Map<String, Object> services) {";
   protected final String TEXT_34 = "\t\t\t" + NL + "\t\t\t\t";
   protected final String TEXT_35 = " ";
   protected final String TEXT_36 = " = (";
diff --git a/com.buglabs.dragonfly.generators/templates/Activator.jet b/com.buglabs.dragonfly.generators/templates/Activator.jet
index 59915b0..6ee6498 100644
--- a/com.buglabs.dragonfly.generators/templates/Activator.jet
+++ b/com.buglabs.dragonfly.generators/templates/Activator.jet
@@ -87,7 +87,7 @@ public class Activator implements BundleActivator {
 		serviceTracker = ServiceTrackerUtil.openServiceTracker(context, new ServiceTrackerUtil.ManagedInlineRunnable() {
 			
 			@Override
-			public void run(Map<Object, Object> services) {
+			public void run(Map<String, Object> services) {
 <%  siter = services.iterator();
 	while(siter.hasNext()) {
 		String sname = (String) siter.next();
@@ -151,7 +151,7 @@ public class Activator implements BundleActivator {
 		serviceTracker = ServiceTrackerUtil.openServiceTracker(context, getServiceNames(serviceMap), createFilter(context, serviceMap), new ServiceTrackerUtil.ManagedInlineRunnable() {
 			
 			@Override
-			public void run(Map<Object, Object> services) {
+			public void run(Map<String, Object> services) {
 <%  siter = services.iterator();
 	while(siter.hasNext()) {
 		String sname = (String) siter.next();