[zb4osgi-changeset] [scm] ZigBee 4 OSGi repository change: r482 - /projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.tester/src/main/java/org/persona/zigbee/tester/gui/TreeViewer.java

[scm-notify at zb4osgi.aaloa.org]

Author: manlio.bacco
Date: Mon Sep 24 17:56:32 2012
New Revision: 482

Log:
added nwk address in visualization panel

Modified:
    projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.tester/src/main/java/org/persona/zigbee/tester/gui/TreeViewer.java

Modified: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.tester/src/main/java/org/persona/zigbee/tester/gui/TreeViewer.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.tester/src/main/java/org/persona/zigbee/tester/gui/TreeViewer.java (original)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.tester/src/main/java/org/persona/zigbee/tester/gui/TreeViewer.java Mon Sep 24 17:56:32 2012
@@ -121,7 +121,6 @@
 		treeModel.nodeStructureChanged(root);
 	}
 
-	@SuppressWarnings("unchecked")
 	public void rootDeviceUnplugged(String udn){
 
 		Enumeration list = root.children();
@@ -160,6 +159,7 @@
 	}
 
 	private void doNodeAction(HADeviceTreeNode node){
+
 		clearPropertiesViewer();
 		if (node == null) {
 			return;
@@ -202,10 +202,10 @@
 			makeProperties(state);
 			Mediator.getPropertiesViewer().setAttributeAction(state);
 		}
-
 	}
 
 	private void clearPropertiesViewer(){
+
 		String[] names = new String[]{};
 		String[] values = new String[]{};
 		PropertiesViewer viewer = Mediator.getPropertiesViewer();
@@ -216,6 +216,7 @@
 	}
 
 	private void makeProperties(ServiceReference reference) {
+
 		Dictionary<String,Object> dict = new Hashtable<String, Object>();
 		dict.put(HADevice.HA_DEVICE_GROUP, reference.getProperty(HADevice.HA_DEVICE_GROUP));
 		dict.put(HADevice.HA_DEVICE_NAME, reference.getProperty(HADevice.HA_DEVICE_NAME));
@@ -230,6 +231,7 @@
 	}
 
 	private void makeProperties(Dictionary<String,Object> dict) {
+
 		int size = dict.size();
 		String[] names = new String[size];
 		String[] values = new String[size];
@@ -245,6 +247,7 @@
 	}
 
 	private void makeProperties(ZigBeeDevice zb){
+
 		int[] clusters;
 		if ( zb == null ) 
 			return;
@@ -280,6 +283,9 @@
 				dict.put(ZigBeeDevice.CLUSTERS_OUTPUT_ID+"["+i+"]","0x"+formatted.toString().substring(4)+" ("+clusters[i]+")");
 			}
 		}
+		
+		// manlio
+		dict.put(ZigBeeNode.NWK_ADDRESS, zb.getPhysicalNode().getNetworkAddress());
 
 		makeProperties(dict);
 	}
@@ -302,6 +308,7 @@
 	}
 
 	private void makeProperties(Cluster service){
+
 		ArrayList<String> names = new ArrayList<String>();
 		ArrayList<String> values = new ArrayList<String>();
 		names.add("Id");
@@ -351,6 +358,7 @@
 	//	}
 
 	private void makeProperties(Attribute state){
+		
 		ArrayList<String> names = new ArrayList<String>();
 		ArrayList<String> values = new ArrayList<String>();
 		names.add("Id");
@@ -372,7 +380,4 @@
 				(String[])values.toArray(new String[]{})
 				);
 	}
-
-
-}
-
+}