Support different threads on prolog datamodel

3 files changed, 14 insertions, 14 deletions

diff --git a/src/uscxml/debug/Breakpoint.cpp b/src/uscxml/debug/Breakpoint.cpp
index 58cf295..df5dd61 100644
--- a/src/uscxml/debug/Breakpoint.cpp
+++ b/src/uscxml/debug/Breakpoint.cpp
@@ -93,11 +93,11 @@ Breakpoint::Breakpoint(const Data& data) {
 	if (data.hasKey("stateId"))
 		stateId = data["stateId"].atom;
 
-	if (data.hasKey("transSource"))
-		transSource = data["transSource"].atom;
+	if (data.hasKey("transSourceId"))
+		transSourceId = data["transSourceId"].atom;
 
-	if (data.hasKey("transTarget"))
-		transTarget = data["transTarget"].atom;
+	if (data.hasKey("transTargetId"))
+		transTargetId = data["transTargetId"].atom;
 
 }
 
@@ -183,11 +183,11 @@ Data Breakpoint::toData() const {
 	if (stateId.length() > 0)
 		data.compound["stateId"] = Data(stateId, Data::VERBATIM);
 
-	if (transSource.length() > 0)
-		data.compound["transSource"] = Data(transSource, Data::VERBATIM);
+	if (transSourceId.length() > 0)
+		data.compound["transSourceId"] = Data(transSourceId, Data::VERBATIM);
 
-	if (transTarget.length() > 0)
-		data.compound["transTarget"] = Data(transTarget, Data::VERBATIM);
+	if (transTargetId.length() > 0)
+		data.compound["transTargetId"] = Data(transTargetId, Data::VERBATIM);
 
 	if (condition.length() > 0)
 		data.compound["condition"] = Data(condition, Data::VERBATIM);
@@ -241,11 +241,11 @@ bool Breakpoint::matches(Interpreter interpreter, const Breakpoint& other) const
 		return Interpreter::isMember(other.element, nodes);
 	}
 
-	if(transSource.length() > 0 && transSource != other.transSource) {
+	if(transSourceId.length() > 0 && transSourceId != other.transSourceId) {
 		return false;
 	}
 
-	if(transTarget.length() > 0 && transTarget != other.transTarget) {
+	if(transTargetId.length() > 0 && transTargetId != other.transTargetId) {
 		return false;
 	}
 	
diff --git a/src/uscxml/debug/Breakpoint.h b/src/uscxml/debug/Breakpoint.h
index cd6fea5..157a56d 100644
--- a/src/uscxml/debug/Breakpoint.h
+++ b/src/uscxml/debug/Breakpoint.h
@@ -79,8 +79,8 @@ public:
 	std::string executableXPath;
 	
 	std::string stateId;
-	std::string transSource;
-	std::string transTarget;
+	std::string transSourceId;
+	std::string transTargetId;
 	
 	std::string condition;
 };
diff --git a/src/uscxml/debug/Debugger.cpp b/src/uscxml/debug/Debugger.cpp
index 3a19228..4fe677c 100644
--- a/src/uscxml/debug/Debugger.cpp
+++ b/src/uscxml/debug/Debugger.cpp
@@ -74,8 +74,8 @@ std::list<Breakpoint> getQualifiedTransBreakpoints(Interpreter interpreter, cons
 		
 		Breakpoint bp = breakpointTemplate; // copy base as template
 		bp.element = transition;
-		bp.transSource = ATTR(source, "id");
-		bp.transTarget = ATTR(target, "id");
+		bp.transSourceId = ATTR(source, "id");
+		bp.transTargetId = ATTR(target, "id");
 		bp.subject = Breakpoint::TRANSITION;
 
 		breakpoints.push_back(bp);