projects
/
smartthings-infrastructure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change value field in events
[smartthings-infrastructure.git]
/
Runner.py
diff --git
a/Runner.py
b/Runner.py
index 8e2db793888869dbbfceb0df17383282fb43caf2..ed4e62c38741d48a67263ebabe2a7029e3558862 100644
(file)
--- a/
Runner.py
+++ b/
Runner.py
@@
-15,6
+15,7
@@
GlobalVariablesEachApp = open("GlobalVariables/"+"GlobalVariablesEachApp.groovy"
setLocationMode = open("Methods/"+"setLocationMode.groovy", "r")
subscribe = open("Methods/"+"subscribe.groovy", "r")
runIn = open("Methods/"+"runIn.groovy", "r")
setLocationMode = open("Methods/"+"setLocationMode.groovy", "r")
subscribe = open("Methods/"+"subscribe.groovy", "r")
runIn = open("Methods/"+"runIn.groovy", "r")
+runDaily = open("Methods/"+"runDaily.groovy", "r")
unschedule = open("Methods/"+"unschedule.groovy", "r")
sendNotificationToContacts = open("Methods/"+"sendNotificationToContacts.groovy", "r")
sendSms = open("Methods/"+"sendSms.groovy", "r")
unschedule = open("Methods/"+"unschedule.groovy", "r")
sendNotificationToContacts = open("Methods/"+"sendNotificationToContacts.groovy", "r")
sendSms = open("Methods/"+"sendSms.groovy", "r")
@@
-116,6
+117,11
@@
Out.write("import ColorTemperature.ColorTemperature\n")
Out.write("import ColorTemperature.ColorTemperatures\n")
Out.write("import Button.Button\n")
Out.write("import Button.Buttons\n")
Out.write("import ColorTemperature.ColorTemperatures\n")
Out.write("import Button.Button\n")
Out.write("import Button.Buttons\n")
+Out.write("import ThreeAxis.ThreeAxis\n")
+Out.write("import ThreeAxis.ThreeAxises\n")
+Out.write("import Momentary.Momentary\n")
+Out.write("import Momentary.Momentaries\n")
+Out.write("import RemainingDevices.RemainingDevices\n")
Out.write("import Event.Event\n")
Out.write("import Timer.SimulatedTimer\n")
Out.write("\n")
Out.write("import Event.Event\n")
Out.write("import Timer.SimulatedTimer\n")
Out.write("\n")
@@
-127,13
+133,18
@@
for line in eventHandler:
Out.write(line)
Out.write("\n")
Out.write("//GlobalVariables for both Apps\n")
Out.write(line)
Out.write("\n")
Out.write("//GlobalVariables for both Apps\n")
+Out.write("@Field def init = Verify.getBoolean()\n\n")
for line in GlobalVariablesBothApps:
Out.write(line)
Out.write("\n")
for line in GlobalVariablesBothApps:
Out.write(line)
Out.write("\n")
+Out.write("//clear init flag now we are done with it\n")
+Out.write("init = false\n")
Out.write("//Application #1\n")
Out.write("class App1 {\n")
Out.write("\tdef reference\n")
Out.write("\tdef location\n")
Out.write("//Application #1\n")
Out.write("class App1 {\n")
Out.write("\tdef reference\n")
Out.write("\tdef location\n")
+Out.write("\t// A local variable added for conflict detection tool\n")
+Out.write("\tdef location_mode\n")
Out.write("\tdef app\n")
Out.write("\n")
Out.write("\t//Extracted objects for App1\n")
Out.write("\tdef app\n")
Out.write("\n")
Out.write("\t//Extracted objects for App1\n")
@@
-162,6
+173,8
@@
for line in subscribe:
Out.write("\t"+line)
for line in runIn:
Out.write("\t"+line)
Out.write("\t"+line)
for line in runIn:
Out.write("\t"+line)
+for line in runDaily:
+ Out.write("\t"+line)
for line in unschedule:
Out.write("\t"+line)
for line in sendNotificationToContacts:
for line in unschedule:
Out.write("\t"+line)
for line in sendNotificationToContacts:
@@
-213,6
+226,7
@@
GlobalVariablesEachApp = open("GlobalVariables/"+"GlobalVariablesEachApp.groovy"
setLocationMode = open("Methods/"+"setLocationMode.groovy", "r")
subscribe = open("Methods/"+"subscribe.groovy", "r")
runIn = open("Methods/"+"runIn.groovy", "r")
setLocationMode = open("Methods/"+"setLocationMode.groovy", "r")
subscribe = open("Methods/"+"subscribe.groovy", "r")
runIn = open("Methods/"+"runIn.groovy", "r")
+runDaily = open("Methods/"+"runDaily.groovy", "r")
unschedule = open("Methods/"+"unschedule.groovy", "r")
sendNotificationToContacts = open("Methods/"+"sendNotificationToContacts.groovy", "r")
sendSms = open("Methods/"+"sendSms.groovy", "r")
unschedule = open("Methods/"+"unschedule.groovy", "r")
sendNotificationToContacts = open("Methods/"+"sendNotificationToContacts.groovy", "r")
sendSms = open("Methods/"+"sendSms.groovy", "r")
@@
-240,6
+254,8
@@
Out.write("//Application #2\n")
Out.write("class App2 {\n")
Out.write("\tdef reference\n")
Out.write("\tdef location\n")
Out.write("class App2 {\n")
Out.write("\tdef reference\n")
Out.write("\tdef location\n")
+Out.write("\t// A local variable added for conflict detection tool\n")
+Out.write("\tdef location_mode\n")
Out.write("\tdef app\n")
Out.write("\n")
Out.write("\t//Extracted objects for App2\n")
Out.write("\tdef app\n")
Out.write("\n")
Out.write("\t//Extracted objects for App2\n")
@@
-268,6
+284,8
@@
for line in subscribe:
Out.write("\t"+line)
for line in runIn:
Out.write("\t"+line)
Out.write("\t"+line)
for line in runIn:
Out.write("\t"+line)
+for line in runDaily:
+ Out.write("\t"+line)
for line in unschedule:
Out.write("\t"+line)
for line in sendNotificationToContacts:
for line in unschedule:
Out.write("\t"+line)
for line in sendNotificationToContacts:
@@
-313,22
+331,22
@@
Out.write("}\n")
Out.write("\n")
Out.write("@Field def app1\n")
Out.write("@Field def app2\n")
Out.write("\n")
Out.write("@Field def app1\n")
Out.write("@Field def app2\n")
-Out.write("def initOrder = Verify.getBoolean()\n")
-Out.write("if (initOrder) {\n")
+Out.write("
//
def initOrder = Verify.getBoolean()\n")
+Out.write("
//
if (initOrder) {\n")
Out.write("\tapp1 = new App1(this)\n")
Out.write("\tapp2 = new App2(this)\n")
Out.write("\tapp1 = new App1(this)\n")
Out.write("\tapp2 = new App2(this)\n")
-Out.write("} else {\n")
-Out.write("\tapp2 = new App2(this)\n")
-Out.write("\tapp1 = new App1(this)\n")
-Out.write("}\n\n")
-Out.write("def installOrder = Verify.getBoolean()\n")
-Out.write("if (installOrder) {\n")
+Out.write("
//
} else {\n")
+Out.write("\t
//
app2 = new App2(this)\n")
+Out.write("\t
//
app1 = new App1(this)\n")
+Out.write("
//
}\n\n")
+Out.write("
//
def installOrder = Verify.getBoolean()\n")
+Out.write("
//
if (installOrder) {\n")
Out.write("\tapp1.installed()\n")
Out.write("\tapp2.installed()\n")
Out.write("\tapp1.installed()\n")
Out.write("\tapp2.installed()\n")
-Out.write("} else {\n")
-Out.write("\tapp2.installed()\n")
-Out.write("\tapp1.installed()\n")
-Out.write("}\n\n")
+Out.write("
//
} else {\n")
+Out.write("\t
//
app2.installed()\n")
+Out.write("\t
//
app1.installed()\n")
+Out.write("
//
}\n\n")
for line in eventSimulator:
Out.write(line)
Out.close()
for line in eventSimulator:
Out.write(line)
Out.close()