Fixing a bug in LocationVar.groovy: to get the string value during analysis we need...

diff --git a/Extractor/ExtractorScript.py b/Extractor/ExtractorScript.py
index e2aa123d4156d26d9e74655806aa51fae2e0b111..725f267acb7cb9cc1df8181a718c7010737b6e24 100644 (file)
--- a/Extractor/ExtractorScript.py
+++ b/Extractor/ExtractorScript.py
@@ -1147,6 +1147,8 @@ def ExtractEvents(extractedEvents):
 def CheckIfOnlyTouchEvents():
        #Check and throw an error if it is all touch events
        #This is called Direct-Direct interaction and we do not model-check for this case
+       # TODO: Commenting out this code since we do this in the analysis itself
+       '''
        onlyTouchEvents = True
        for item in eventList:
                if item != "nfcTouch" and item != "app" and item != "button":
@@ -1157,6 +1159,7 @@ def CheckIfOnlyTouchEvents():
                extractError.write("Direct-Direct Interaction detected: we are skipping this pair...\n")
                extractError.close()
                raise Exception("\n\nDirect-Direct Interaction detected: we are skipping this pair...\n\n")
+       '''
 
 
 #Extract objects to call functions from App1

diff --git a/Location/LocationVar.groovy b/Location/LocationVar.groovy
index 3f5e46e25017e1e92d3841c1b9723cb8c9bdc163..c6b2c8b17b989adabc066dc45983e0fd6765ec96 100755 (executable)
--- a/Location/LocationVar.groovy
+++ b/Location/LocationVar.groovy
@@ -51,7 +51,7 @@ class LocationVar {
        //By Model Checker
        def setValue(LinkedHashMap eventDataMap) {
                if (this.mode != eventDataMap['value']) {
-                       def sentMode = eventDataMap['value']
+                       String sentMode = eventDataMap['value']
                        println("The location is changed to $sentMode!")
                        this.mode = sentMode
                        this.locationMode = sentMode