Fixing conflicting files.

diff --git a/Lock/Lock.groovy b/Lock/Lock.groovy
index 4b84497003b6696d86c74eacdcc6567f32766919..0271050af9dd100f9bedc0c430caa4fe3ea8a765 100644 (file)
--- a/Lock/Lock.groovy
+++ b/Lock/Lock.groovy
@@ -28,10 +28,6 @@ public class Lock {
        def lock() {
                if (lockState != "locked") {
                        println("the door with id:$id is locked!")
-<<<<<<< HEAD
-=======
-                       //this.lockLatestValue = this.lockState
->>>>>>> a02c9807815a35c0f57241ee6510a3d312499049
                        this.lockLatestValue = "locked"
                        this.lockState = "locked"
                        this.currentLock = "locked"
@@ -46,10 +42,6 @@ public class Lock {
                if (lockState != "locked") {
                        def task = timers.runAfter(metaData["delay"]) {
                                println("the door with id:$id is locked!")
-<<<<<<< HEAD
-=======
-                               //this.lockLatestValue = this.lockState
->>>>>>> a02c9807815a35c0f57241ee6510a3d312499049
                                this.lockLatestValue = "locked"
                                this.lockState = "locked"
                                this.currentLock = "locked"
@@ -64,10 +56,6 @@ public class Lock {
        def unlock() {
                if (lockState != "unlocked") {
                        println("the door with id:$id is unlocked!")
-<<<<<<< HEAD
-=======
-                       //this.lockLatestValue = this.lockState
->>>>>>> a02c9807815a35c0f57241ee6510a3d312499049
                        this.lockLatestValue = "unlocked"
                        this.lockState = "unlocked"
                        this.currentLock = "unlocked"
@@ -75,11 +63,8 @@ public class Lock {
                                  displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
                        sendEvent([name: "lock", value: "unlocked", deviceId: this.id, descriptionText: "",
                                  displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-<<<<<<< HEAD
                        sendEvent([name: "lock.unlocked", value: "unlocked", deviceId: this.id, descriptionText: "",
                                  displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-=======
->>>>>>> a02c9807815a35c0f57241ee6510a3d312499049
                }
        }
 
@@ -87,7 +72,6 @@ public class Lock {
                if (lockState != "unlocked") {
                        def task = timers.runAfter(metaData["delay"]) {
                                println("the door with id:$id is locked!")
-<<<<<<< HEAD
                                this.lockLatestValue = "unlocked"
                                this.lockState = "unlocked"
                                this.currentLock = "unlocked"
@@ -97,16 +81,6 @@ public class Lock {
                                          displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
                                sendEvent([name: "lock.unlocked", value: "unlocked", deviceId: this.id, descriptionText: "",
                                          displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])                             
-=======
-                               //this.lockLatestValue = this.lockState
-                               this.lockLatestValue = "locked"
-                               this.lockState = "locked"
-                               this.currentLock = "locked"
-                               sendEvent([name: "unlock", value: "unlocked", deviceId: this.id, descriptionText: "",
-                                         displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-                               sendEvent([name: "lock", value: "unlocked", deviceId: this.id, descriptionText: "",
-                                               displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
->>>>>>> a02c9807815a35c0f57241ee6510a3d312499049
                        }
                }
        }

diff --git a/MusicPlayer/MusicPlayers.groovy b/MusicPlayer/MusicPlayers.groovy
index 486feeac79a9f468c945db62ec22eb3081d44322..c2d8b75dda55204f5742f4e6e637a5004931eea3 100644 (file)
--- a/MusicPlayer/MusicPlayers.groovy
+++ b/MusicPlayer/MusicPlayers.groovy
@@ -44,9 +44,6 @@ public class MusicPlayers {
                } else {
                        this.status = "stopped"
                }
-<<<<<<< HEAD
-
-=======
                def initTrack = Verify.getIntFromList(1, 2, 3)
                this.trackNumber = initTrack 
                def initData = Verify.getBoolean()
@@ -61,7 +58,6 @@ public class MusicPlayers {
                } else {
                        this.trackDescription = "someOtherDescriptions"
                }*/
->>>>>>> a02c9807815a35c0f57241ee6510a3d312499049
                musicPlayers.add(new MusicPlayer(sendEvent, id, label, displayName, this.level, this.mute, this.status, this.trackNumber, this.trackData, this.trackDescription))
        }
 

diff --git a/SmokeDetector/SmokeDetectors.groovy b/SmokeDetector/SmokeDetectors.groovy
index 94c6176d2e79272524931b0b7a8bee1ce1a45736..e7aec2f7aa5279456a837eb2af5f219026802670 100644 (file)
--- a/SmokeDetector/SmokeDetectors.groovy
+++ b/SmokeDetector/SmokeDetectors.groovy
@@ -29,17 +29,8 @@ public class SmokeDetectors {
                this.deviceNumbers = deviceNumbers
                this.smokeDetectors = []
 
-<<<<<<< HEAD
-               def initBattery = Verify.getIntFromList(30, 50, 70)
-               this.battery = initBattery
-               this.batteryLatestValue = initBattery
-
-               def initSmoke = Verify.getInt(0,2)
-               if (initSmoke == 0) {
-=======
                /*def init = Verify.getInt(0,2)
                if (init == 0) {
->>>>>>> a02c9807815a35c0f57241ee6510a3d312499049
                        this.currentSmokeValue = "clear"
                        this.smokeLatestValue = "clear"
                } else if (initSmoke == 1) {
@@ -48,7 +39,6 @@ public class SmokeDetectors {
                } else {
                        this.currentSmokeValue = "tested"
                        this.smokeLatestValue = "tested"                
-<<<<<<< HEAD
                }
 
                def initCarbonMonoxide = Verify.getInt(0,2)
@@ -62,12 +52,8 @@ public class SmokeDetectors {
                        this.currentCarbonMonoxideValue = "tested"
                        this.carbonMonoxideLatestValue = "tested"               
                }
-               smokeDetectors.add(new SmokeDetector(id, label, displayName, this.currentSmokeValue, this.smokeLatestValue, this.currentCarbonMonoxideValue,
-                                                     this.carbonMonoxideLatestValue, this.battery))
-=======
                }*/
                smokeDetectors.add(new SmokeDetector(id, label, displayName, this.currentSmokeValue, this.smokeLatestValue))
->>>>>>> a02c9807815a35c0f57241ee6510a3d312499049
        }
 
        //By Model Checker

diff --git a/TemperatureMeasurement/TemperatureMeasurements.groovy b/TemperatureMeasurement/TemperatureMeasurements.groovy
index 20d1f5af01bd44c3dd2259eff76a0a8e044edd86..31ba842155c964f2da0b8140c6ffe03863ba9924 100644 (file)
--- a/TemperatureMeasurement/TemperatureMeasurements.groovy
+++ b/TemperatureMeasurement/TemperatureMeasurements.groovy
@@ -15,12 +15,8 @@ public class TemperatureMeasurements {
        private String label = "temperatureMeasurement0"
        private String displayName = "temperatureMeasurement0"
        private int temperature = 50
-<<<<<<< HEAD
        private int currentTemperature = 50
 
-=======
->>>>>>> a02c9807815a35c0f57241ee6510a3d312499049
-       
        TemperatureMeasurements(Closure sendEvent, int deviceNumbers) {
                this.sendEvent = sendEvent              
                this.deviceNumbers = deviceNumbers

diff --git a/Thermostat/Thermostats.groovy b/Thermostat/Thermostats.groovy
index 80a643b6a5ae0be8fbdaa4961f354e617254fab2..42a8728ebaa584e942d3bd3a2520610ec4183356 100644 (file)
--- a/Thermostat/Thermostats.groovy
+++ b/Thermostat/Thermostats.groovy
@@ -99,12 +99,8 @@ public class Thermostats{
                } else {
                        this.thermostatMode = "off"
                        this.currentThermostatMode = "off"
-<<<<<<< HEAD
                        this.thermostatLatestMode = "off"
-               }
-=======
                }*/
->>>>>>> a02c9807815a35c0f57241ee6510a3d312499049
 
                thermostats.add(new Thermostat(sendEvent, id, label, displayName, this.temperature, this.currentCoolingSetpoint, 
                                                this.currentHeatingSetpoint, this.coolingSetpoint, this.thermostatSetpoint, this.heatingSetpoint, this.coolingSetpointRange,