[zb4osgi-changeset] [scm] ZigBee 4 OSGi repository change: r481 - in /projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.tester/src/main/java/org/persona/zigbee/tester/discovery: DeviceNode.java DeviceNodeListener.java DevicesList.java RootDeviceListener.java
scm-notify at zb4osgi.aaloa.org
scm-notify at zb4osgi.aaloa.org
Mon Sep 24 17:54:08 CEST 2012
Author: manlio.bacco
Date: Mon Sep 24 17:54:08 2012
New Revision: 481
Log:
minor fixes
Modified:
projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.tester/src/main/java/org/persona/zigbee/tester/discovery/DeviceNode.java
projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.tester/src/main/java/org/persona/zigbee/tester/discovery/DeviceNodeListener.java
projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.tester/src/main/java/org/persona/zigbee/tester/discovery/DevicesList.java
projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.tester/src/main/java/org/persona/zigbee/tester/discovery/RootDeviceListener.java
Modified: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.tester/src/main/java/org/persona/zigbee/tester/discovery/DeviceNode.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.tester/src/main/java/org/persona/zigbee/tester/discovery/DeviceNode.java (original)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.tester/src/main/java/org/persona/zigbee/tester/discovery/DeviceNode.java Mon Sep 24 17:54:08 2012
@@ -108,10 +108,9 @@
for (int j=0;j< multiple.length;j++){
System.out.println(multiple[j]+ ";");
}
-
}
else System.out.println(props[i]+ "="+ prop);
}
System.out.println("####Device Node");
}
-}
+}
Modified: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.tester/src/main/java/org/persona/zigbee/tester/discovery/DeviceNodeListener.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.tester/src/main/java/org/persona/zigbee/tester/discovery/DeviceNodeListener.java (original)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.tester/src/main/java/org/persona/zigbee/tester/discovery/DeviceNodeListener.java Mon Sep 24 17:54:08 2012
@@ -38,6 +38,5 @@
public void deviceDetected( ServiceReference sr );
- public void rootDeviceUnplugged( String udn );
-
+ public void rootDeviceUnplugged( String udn );
}
Modified: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.tester/src/main/java/org/persona/zigbee/tester/discovery/DevicesList.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.tester/src/main/java/org/persona/zigbee/tester/discovery/DevicesList.java (original)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.tester/src/main/java/org/persona/zigbee/tester/discovery/DevicesList.java Mon Sep 24 17:54:08 2012
@@ -39,8 +39,7 @@
public DevicesList(){
devices = new ArrayList();
- }
-
+ }
public boolean add(DeviceNode dev) {
if(listener!=null)
@@ -64,7 +63,5 @@
public void setChangeListener(DeviceChangeListener listener) {
this.listener = listener;
- }
-
-
-}
+ }
+}
Modified: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.tester/src/main/java/org/persona/zigbee/tester/discovery/RootDeviceListener.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.tester/src/main/java/org/persona/zigbee/tester/discovery/RootDeviceListener.java (original)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.tester/src/main/java/org/persona/zigbee/tester/discovery/RootDeviceListener.java Mon Sep 24 17:54:08 2012
@@ -61,7 +61,6 @@
public void serviceChanged(ServiceEvent e) {
switch(e.getType()){
case ServiceEvent.REGISTERED:{
- //LogPanel.log("1 e.getServiceReference(): "+e.getServiceReference());
addNewDevice(e.getServiceReference());
};break;
@@ -81,7 +80,7 @@
public void serviceChanged(ServiceEvent e) {
switch(e.getType()){
case ServiceEvent.REGISTERED:{
- //LogPanel.log("2 e.getServiceReference(): "+e.getServiceReference());
+ // removed to avoid duplicate devices in tree
//listener.deviceDetected( e.getServiceReference() );
};break;
@@ -280,4 +279,4 @@
// LogPanel.log("[Warning] missing property: "+UPnPDevice.TYPE);
//
// }
-}
+}
More information about the Commit
mailing list