projects
/
smartthings-infrastructure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adjusting setLocationMode for global-variable conflict detection.
[smartthings-infrastructure.git]
/
Runner.py
diff --git
a/Runner.py
b/Runner.py
index
ad8dff0
..
81efa7a
100644
(file)
--- a/
Runner.py
+++ b/
Runner.py
@@
-142,6
+142,8
@@
Out.write("//Application #1\n")
Out.write("class App1 {\n")
Out.write("\tdef reference\n")
Out.write("\tdef location\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")
@@
-251,6
+253,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")