ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

logic: Added namespaces to overview and fixed namespace activation

Browse Source
This commit is contained in:
Eberhard Graether
2016-02-08 03:39:08 +01:00
parent d6c03ffb02
commit 29149f313a
24 changed files with 147 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/component/controller/helper/ActivationTranslator.cpp
+11 -3
View File
@@ -95,7 +95,11 @@ std::shared_ptr<MessageActivateTokens> ActivationTranslator::translateMessage(co
}
std::shared_ptr<MessageActivateTokens> m;
m = std::make_shared<MessageActivateTokens>(message, nodeIds);
m = std::make_shared<MessageActivateTokens>(message, m_storageAccess->getActiveTokenIdsForTokenIds(nodeIds));
if (nodeIds != m->tokenIds)
{
m->originalTokenIds = nodeIds;
}
m->isFromSystem = message->isFromSystem;
return m;
}
@@ -130,9 +134,13 @@ std::shared_ptr<MessageActivateTokens> ActivationTranslator::translateMessage(co
}
std::vector<Id> tokenIds = m_storageAccess->getTokenIdsForMatches(matches);
tokenIds = m_storageAccess->getActiveTokenIdsForTokenIds(tokenIds);
std::shared_ptr<MessageActivateTokens> m = std::make_shared<MessageActivateTokens>(message, tokenIds);
std::shared_ptr<MessageActivateTokens> m =
std::make_shared<MessageActivateTokens>(message, m_storageAccess->getActiveTokenIdsForTokenIds(tokenIds));
if (tokenIds != m->tokenIds)
{
m->originalTokenIds = tokenIds;
}
if (message->isFresh())
{
m->isFromSearch = true;