src: Rename aggregation edge to bundled edges (#1051)

The term aggregation is misleading. Bundled edges is a better definition for this type of edge.

closes #962

src/lib/utility/messaging/type/activation/MessageActivateTokens.h

@@ -18,7 +18,7 @@ public:
 	}
 
 	MessageActivateTokens(const MessageBase* other)
-		: isEdge(false), isAggregation(false), isFromSearch(false)
+		: isEdge(false), isBundledEdges(false), isFromSearch(false)
 	{
 		setIsParallel(true);
 		setKeepContent(other->keepContent());
@@ -43,10 +43,10 @@ public:
 
 	std::vector<SearchMatch> getSearchMatches() const override
 	{
-		if (isAggregation)
+		if (isBundledEdges)
 		{
 			SearchMatch match;
-			match.name = match.text = L"aggregation";	 // TODO: show aggregation source and target
+			match.name = match.text = L"bundled edges";	 // TODO: show bundled edges source and target
 			match.searchType = SearchMatch::SEARCH_TOKEN;
 			match.nodeType = NodeType(NODE_TYPE);
 			return {match};
@@ -59,7 +59,7 @@ public:
 	std::vector<SearchMatch> searchMatches;
 
 	bool isEdge;
-	bool isAggregation;
+	bool isBundledEdges;
 	bool isFromSearch;
 };
 

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

@@ -22,7 +22,7 @@ public:
 		, sourceNameHierarchy(sourceNameHierarchy)
 		, targetNameHierarchy(targetNameHierarchy)
 	{
-		if (!isAggregation())
+		if (!isBundledEdges())
 		{
 			setKeepContent(true);
 		}
@@ -35,9 +35,9 @@ public:
 		return "MessageActivateEdge";
 	}
 
-	bool isAggregation() const
+	bool isBundledEdges() const
 	{
-		return type == Edge::EDGE_AGGREGATION;
+		return type == Edge::EDGE_BUNDLED_EDGES;
 	}
 
 	std::wstring getFullName() const
@@ -58,7 +58,7 @@ public:
 	const NameHierarchy sourceNameHierarchy;
 	const NameHierarchy targetNameHierarchy;
 
-	std::vector<Id> aggregationIds;
+	std::vector<Id> bundledEdgesIds;
 };
 
 #endif	  // MESSAGE_ACTIVATE_EDGE_H