Cleaning up benchmarks and drivers code.

[iot2.git] / benchmarks / drivers / Java / MultipurposeSensor / MultipurposeSensor.java

diff --git a/benchmarks/drivers/Java/MultipurposeSensor/MultipurposeSensor.java b/benchmarks/drivers/Java/MultipurposeSensor/MultipurposeSensor.java
index 5b91b4ef4922393d1d34a0f8f2340b8a4fe90b50..3f3266a754e1d832f78133293c9b579e412288e1 100644 (file)
--- a/benchmarks/drivers/Java/MultipurposeSensor/MultipurposeSensor.java
+++ b/benchmarks/drivers/Java/MultipurposeSensor/MultipurposeSensor.java
@@ -6,11 +6,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.Semaphore;
 
-// Checker annotations
-//import iotchecker.qual.*;
-import iotcode.annotation.*;
-
 // IoT Packages
+import iotcode.annotation.*;
 import iotruntime.slave.*;
 import iotcode.interfaces.*;
 import iotruntime.zigbee.*;
@@ -45,6 +42,7 @@ public class MultipurposeSensor implements IoTZigbeeCallback, SmartthingsSensor
        @config private IoTSet<IoTDeviceAddress> multipurposeSensorUdpAddress;
        @config private IoTSet<IoTZigbeeAddress> multipurposeSensorZigbeeAddress;
 
+       // TODO: Test constructor
        //public MultipurposeSensor(IoTSet<IoTDeviceAddress> dSet, IoTSet<IoTZigbeeAddress> zigSet) {
                //multipurposeSensorUdpAddress = dSet;
                //multipurposeSensorZigbeeAddress = zigSet;
@@ -82,7 +80,7 @@ public class MultipurposeSensor implements IoTZigbeeCallback, SmartthingsSensor
                        zigConnection.init();
                        System.out.println("Initialized!");
 
-                       //made by changwoo
+                       // made by Changwoo
                        sleep(10);
                        System.out.println("Sending Management Permit Joining Request");
                        for(int z=0; z<3; z++){
@@ -90,14 +88,14 @@ public class MultipurposeSensor implements IoTZigbeeCallback, SmartthingsSensor
                                sleep(0);
                        }
 
-                       //made by changwoo
+                       // made by Changwoo
                        while (!didWriteAttrb.get()) {
                                System.out.println("Sending Write Attribute Request");
                                zigConnection.sendWriteAttributesCommand(0x0002, 0x0500, 0x0104, 0x01);
                                sleep(0);
                        }
 
-                       //made by changwoo
+                       // made by Changwoo
                        System.out.println("Sending Enrollment Reponse");
                        zigConnection.sendEnrollmentResponse(0x0003, 0x0500, 0x0104, 0x01);
                        sleep(0);
@@ -107,7 +105,7 @@ public class MultipurposeSensor implements IoTZigbeeCallback, SmartthingsSensor
                }
        }
 
-       //made by changwoo
+       // made by Changwoo
        private void sleep(int multipleTime){
                if(multipleTime<=0){
                        multipleTime=1;
@@ -200,7 +198,7 @@ public class MultipurposeSensor implements IoTZigbeeCallback, SmartthingsSensor
 
        public void newMessageAvailable(IoTZigbeeMessage _zm) {
 
-               //made by changwoo
+               // made by Changwoo
                if(_zm instanceof IoTZigbeeMessageZclZoneStatusChangeNotification){
                        IoTZigbeeMessageZclZoneStatusChangeNotification message = (IoTZigbeeMessageZclZoneStatusChangeNotification)_zm;
                        if(message.getSuccessOrFail()){
@@ -222,14 +220,14 @@ public class MultipurposeSensor implements IoTZigbeeCallback, SmartthingsSensor
                                }
                        }//if
                
-               //made by changwoo
-               }//if
+               // made by Changwoo
+               }
                else if (_zm instanceof IoTZigbeeMessageZclWriteAttributesResponse) {
                        IoTZigbeeMessageZclWriteAttributesResponse message = (IoTZigbeeMessageZclWriteAttributesResponse)_zm;
                        if (message.getSuccessOrFail()) {
                                didWriteAttrb.set(true);
-                       }//if
-               }//else if
+                       }
+               }
        }
 
        public void registerCallback(SmartthingsSensorSmartCallback _callbackTo) {