Author: donsez
Date: Mon Aug 20 16:21:09 2007
New Revision: 567876
URL: http://svn.apache.org/viewvc?rev=567876&view=rev
Log:
change the class of the property "serviceInfo" in the sent events
cosmetic changes
Modified:
felix/sandbox/donsez/mdns/src/main/java/org/apache/felix/sandbox/mdns/impl/MDnsEventSender.java
Modified:
felix/sandbox/donsez/mdns/src/main/java/org/apache/felix/sandbox/mdns/impl/MDnsEventSender.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/donsez/mdns/src/main/java/org/apache/felix/sandbox/mdns/impl/MDnsEventSender.java?rev=567876&r1=567875&r2=567876&view=diff
==============================================================================
---
felix/sandbox/donsez/mdns/src/main/java/org/apache/felix/sandbox/mdns/impl/MDnsEventSender.java
(original)
+++
felix/sandbox/donsez/mdns/src/main/java/org/apache/felix/sandbox/mdns/impl/MDnsEventSender.java
Mon Aug 20 16:21:09 2007
@@ -36,27 +36,31 @@
/**
- * This class converts javax.jmdns.ServiceEvent in
org.osgi.service.event.Event objects and sends them
+ * This class send org.osgi.service.event.Event objects when it receives
javax.jmdns.ServiceEvent
* @author <a href="mailto:[EMAIL PROTECTED]">Felix Project Team</a>
*/
public class MDnsEventSender implements javax.jmdns.ServiceListener,
javax.jmdns.ServiceTypeListener, BundleActivator {
- private ServiceTracker serviceTracker;
- private JmDNS jmDNS;
- private Set types;
+ private ServiceTracker m_serviceTracker;
+ private JmDNS m_jmDNS;
+ private Set m_serviceTypes;
+ /**
+ * constructor
+ * @param m_jmDNS
+ */
public MDnsEventSender(JmDNS jmDNS) {
- this.jmDNS=jmDNS;
+ this.m_jmDNS=jmDNS;
}
/**
* @see
javax.jmdns.ServiceListener#serviceAdded(javax.jmdns.ServiceEvent)
*/
public void serviceAdded(ServiceEvent serviceEvent) {
- EventAdmin eventAdmin=(EventAdmin) serviceTracker.getService();
+ EventAdmin eventAdmin=(EventAdmin)
m_serviceTracker.getService();
if (eventAdmin != null) {
Dictionary properties=new Hashtable();
- properties.put("serviceInfo", serviceEvent.getInfo());
+ properties.put("serviceInfo", new
ServiceInfoImpl(serviceEvent.getInfo()));
eventAdmin.sendEvent(new
Event(Constants.SERVICE_ADDED_TOPIC,properties));
}
}
@@ -65,10 +69,10 @@
* @see
javax.jmdns.ServiceListener#serviceRemoved(javax.jmdns.ServiceEvent)
*/
public void serviceRemoved(ServiceEvent serviceEvent) {
- EventAdmin eventAdmin=(EventAdmin) serviceTracker.getService();
+ EventAdmin eventAdmin=(EventAdmin)
m_serviceTracker.getService();
if (eventAdmin != null) {
Dictionary properties=new Hashtable();
- properties.put("serviceInfo", serviceEvent.getInfo());
+ properties.put("serviceInfo", new
ServiceInfoImpl(serviceEvent.getInfo()));
eventAdmin.sendEvent(new
Event(Constants.SERVICE_ADDED_TOPIC,properties));
}
}
@@ -77,10 +81,10 @@
* @see
javax.jmdns.ServiceListener#serviceResolved(javax.jmdns.ServiceEvent)
*/
public void serviceResolved(ServiceEvent serviceEvent) {
- EventAdmin eventAdmin=(EventAdmin) serviceTracker.getService();
+ EventAdmin eventAdmin=(EventAdmin)
m_serviceTracker.getService();
if (eventAdmin != null) {
Dictionary properties=new Hashtable();
- properties.put("serviceInfo", serviceEvent.getInfo());
+ properties.put("serviceInfo", new
ServiceInfoImpl(serviceEvent.getInfo()));
eventAdmin.sendEvent(new
Event(Constants.SERVICE_ADDED_TOPIC,properties));
}
}
@@ -89,7 +93,7 @@
* @see
javax.jmdns.ServiceTypeListener#serviceTypeAdded(javax.jmdns.ServiceEvent)
*/
public void serviceTypeAdded(ServiceEvent serviceEvent) {
- EventAdmin eventAdmin=(EventAdmin) serviceTracker.getService();
+ EventAdmin eventAdmin=(EventAdmin)
m_serviceTracker.getService();
if (eventAdmin != null) {
String type=serviceEvent.getType();
if(type==null) return;
@@ -98,26 +102,26 @@
properties.put("serviceType", type);
eventAdmin.sendEvent(new
Event(Constants.SERVICE_ADDED_TOPIC,properties));
- types.add(type);
- jmDNS.addServiceListener(type, this);
+ m_serviceTypes.add(type);
+ m_jmDNS.addServiceListener(type, this);
}
}
public void start(BundleContext bundleContext) throws Exception {
- serviceTracker=new
ServiceTracker(bundleContext,EventAdmin.class.getName(),null);
- serviceTracker.open();
+ m_serviceTracker=new
ServiceTracker(bundleContext,EventAdmin.class.getName(),null);
+ m_serviceTracker.open();
- types=new HashSet();
- jmDNS.addServiceTypeListener(this);
+ m_serviceTypes=new HashSet();
+ m_jmDNS.addServiceTypeListener(this);
}
public void stop(BundleContext bundleContext) throws Exception {
- serviceTracker.close();
+ m_serviceTracker.close();
- jmDNS.removeServiceTypeListener(this);
+ m_jmDNS.removeServiceTypeListener(this);
- Iterator iterator=types.iterator();
+ Iterator iterator=m_serviceTypes.iterator();
while(iterator.hasNext())
- jmDNS.removeServiceListener((String)iterator.next(),this);
+ m_jmDNS.removeServiceListener((String)iterator.next(),this);
}
}
