data: refactored file clearing on reparse to use TaskClearStorage

src/lib/utility/messaging/type/MessageActivateEdge.h

@@ -5,15 +5,17 @@
 #include "utility/types.h"
 
 #include "data/graph/Edge.h"
+#include "data/name/NameHierarchy.h"
 
 class MessageActivateEdge
 	: public Message<MessageActivateEdge>
 {
 public:
-	MessageActivateEdge(Id tokenId, Edge::EdgeType type, const std::string& name)
+	MessageActivateEdge(Id tokenId, Edge::EdgeType type, const NameHierarchy& fromName, const NameHierarchy& toName)
 		: tokenId(tokenId)
 		, type(type)
-		, name(name)
+		, fromNameHierarchy(fromName)
+		, toNameHierarchy(toName)
 	{
 	}
 
@@ -27,9 +29,15 @@ public:
 		return type == Edge::EDGE_AGGREGATION;
 	}
 
+	std::string getFullName() const
+	{
+		return Edge::getTypeString(type) + ":" + fromNameHierarchy.getFullName() + "->" + toNameHierarchy.getFullName();
+	}
+
 	const Id tokenId;
 	const Edge::EdgeType type;
-	const std::string name;
+	const NameHierarchy fromNameHierarchy;
+	const NameHierarchy toNameHierarchy;
 };
 
 #endif // MESSAGE_ACTIVATE_EDGE_H

src/lib/utility/messaging/type/MessageActivateNodes.h

@@ -14,7 +14,7 @@ public:
 	{
 		Id nodeId;
 		Node::NodeType type;
-		std::string name;
+		NameHierarchy nameHierarchy;
 	};
 
 	MessageActivateNodes()
@@ -22,12 +22,12 @@ public:
 	{
 	}
 
-	void addNode(Id tokenId, Node::NodeType type, const std::string& name)
+	void addNode(Id tokenId, Node::NodeType type, const NameHierarchy& nameHierarchy)
 	{
 		ActiveNode node;
 		node.nodeId = tokenId;
 		node.type = type;
-		node.name = name;
+		node.nameHierarchy = nameHierarchy;
 
 		nodes.push_back(node);
 	}