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

data: split off inner classes of SearchIndex

Browse Source
This commit is contained in:
Eberhard Graether
2014-10-28 22:06:22 +01:00
parent 86f4629b0d
commit 2c84bf20ed
32 changed files with 723 additions and 670 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/data/graph/StorageGraph.cpp
+6 -6
View File
@@ -12,7 +12,7 @@ StorageGraph::~StorageGraph()
{
}
Node* StorageGraph::createNodeHierarchy(Node::NodeType type, SearchIndex::SearchNode* searchNode)
Node* StorageGraph::createNodeHierarchy(Node::NodeType type, SearchNode* searchNode)
{
Node* node = getNodeById(searchNode->getFirstTokenId());
if (!node)
@@ -29,7 +29,7 @@ Node* StorageGraph::createNodeHierarchy(Node::NodeType type, SearchIndex::Search
}
Node* StorageGraph::createNodeHierarchyWithDistinctSignature(
Node::NodeType type, SearchIndex::SearchNode* searchNode, std::shared_ptr<TokenComponentSignature> signature
Node::NodeType type, SearchNode* searchNode, std::shared_ptr<TokenComponentSignature> signature
){
Node* node = getNodeById(searchNode->getFirstTokenId());
if (!node)
@@ -90,9 +90,9 @@ Edge* StorageGraph::createEdge(Edge::EdgeType type, Node* from, Node* to)
return insertEdge(type, from, to);
}
Node* StorageGraph::insertNodeHierarchy(Node::NodeType type, SearchIndex::SearchNode* searchNode)
Node* StorageGraph::insertNodeHierarchy(Node::NodeType type, SearchNode* searchNode)
{
std::deque<SearchIndex::SearchNode*> searchNodes = searchNode->getParentsWithoutTokenId();
std::deque<SearchNode*> searchNodes = searchNode->getParentsWithoutTokenId();
if (!searchNodes.size())
{
@@ -101,7 +101,7 @@ Node* StorageGraph::insertNodeHierarchy(Node::NodeType type, SearchIndex::Search
}
Node* parentNode = nullptr;
SearchIndex::SearchNode* parentSearchNode = searchNodes.front()->getParent();
SearchNode* parentSearchNode = searchNodes.front()->getParent();
if (parentSearchNode)
{
parentNode = getNodeById(parentSearchNode->getFirstTokenId());
@@ -118,7 +118,7 @@ Node* StorageGraph::insertNodeHierarchy(Node::NodeType type, SearchIndex::Search
return parentNode;
}
Node* StorageGraph::insertNode(Node::NodeType type, Node* parentNode, SearchIndex::SearchNode* searchNode)
Node* StorageGraph::insertNode(Node::NodeType type, Node* parentNode, SearchNode* searchNode)
{
std::shared_ptr<Node> node =
std::make_shared<Node>(type, std::make_shared<TokenComponentNameReferenced>(searchNode));
src/lib/data/graph/StorageGraph.h
+5 -5
View File
@@ -3,7 +3,7 @@
#include "data/graph/Graph.h"
#include "data/graph/token_component/TokenComponentSignature.h"
#include "data/SearchIndex.h"
#include "data/search/SearchNode.h"
class StorageGraph
: public Graph
@@ -12,14 +12,14 @@ public:
StorageGraph();
virtual ~StorageGraph();
Node* createNodeHierarchy(Node::NodeType type, SearchIndex::SearchNode* searchNode);
Node* createNodeHierarchy(Node::NodeType type, SearchNode* searchNode);
Node* createNodeHierarchyWithDistinctSignature(
Node::NodeType type, SearchIndex::SearchNode* searchNode, std::shared_ptr<TokenComponentSignature> signature);
Node::NodeType type, SearchNode* searchNode, std::shared_ptr<TokenComponentSignature> signature);
Edge* createEdge(Edge::EdgeType type, Node* from, Node* to);
private:
Node* insertNodeHierarchy(Node::NodeType type, SearchIndex::SearchNode* searchNode);
Node* insertNode(Node::NodeType type, Node* parentNode, SearchIndex::SearchNode* searchNode);
Node* insertNodeHierarchy(Node::NodeType type, SearchNode* searchNode);
Node* insertNode(Node::NodeType type, Node* parentNode, SearchNode* searchNode);
Edge* insertEdge(Edge::EdgeType type, Node* from, Node* to);
};
src/lib/data/graph/token_component/TokenComponentName.cpp
+5 -3
View File
@@ -2,6 +2,8 @@
#include "utility/utilityString.h"
#include "data/search/SearchIndex.h"
TokenComponentName::TokenComponentName()
{
}
@@ -16,7 +18,7 @@ std::shared_ptr<TokenComponentName> TokenComponentName::copyComponentName() cons
}
TokenComponentNameReferenced::TokenComponentNameReferenced(const SearchIndex::SearchNode* searchNode)
TokenComponentNameReferenced::TokenComponentNameReferenced(const SearchNode* searchNode)
: m_searchNode(searchNode)
{
}
@@ -40,7 +42,7 @@ std::string TokenComponentNameReferenced::getFullName() const
return m_searchNode->getFullName();
}
const SearchIndex::SearchNode* TokenComponentNameReferenced::getSearchNode() const
const SearchNode* TokenComponentNameReferenced::getSearchNode() const
{
return m_searchNode;
}
@@ -69,7 +71,7 @@ std::string TokenComponentNameCached::getFullName() const
return m_fullName;
}
const SearchIndex::SearchNode* TokenComponentNameCached::getSearchNode() const
const SearchNode* TokenComponentNameCached::getSearchNode() const
{
return nullptr;
}
src/lib/data/graph/token_component/TokenComponentName.h
+6 -6
View File
@@ -4,7 +4,7 @@
#include <string>
#include "data/graph/token_component/TokenComponent.h"
#include "data/SearchIndex.h"
#include "data/search/SearchNode.h"
class TokenComponentName
: public TokenComponent
@@ -18,7 +18,7 @@ public:
virtual std::string getName() const = 0;
virtual std::string getFullName() const = 0;
virtual const SearchIndex::SearchNode* getSearchNode() const = 0;
virtual const SearchNode* getSearchNode() const = 0;
};
@@ -26,7 +26,7 @@ class TokenComponentNameReferenced
: public TokenComponentName
{
public:
TokenComponentNameReferenced(const SearchIndex::SearchNode* searchNode);
TokenComponentNameReferenced(const SearchNode* searchNode);
virtual ~TokenComponentNameReferenced();
virtual std::shared_ptr<TokenComponent> copy() const;
@@ -34,10 +34,10 @@ public:
virtual std::string getName() const;
virtual std::string getFullName() const;
virtual const SearchIndex::SearchNode* getSearchNode() const;
virtual const SearchNode* getSearchNode() const;
private:
const SearchIndex::SearchNode* m_searchNode;
const SearchNode* m_searchNode;
};
@@ -53,7 +53,7 @@ public:
virtual std::string getName() const;
virtual std::string getFullName() const;
virtual const SearchIndex::SearchNode* getSearchNode() const;
virtual const SearchNode* getSearchNode() const;
private:
const std::string m_fullName;