logic: moved Storage into Project

Moved Storage instantiation into the Project. Storage access is still handled via the GraphAccess and LocationAccess
interfaces, but the ComponentFactory now only serves proxy implementations of these access classes. Project is
responsible for setting the subject of the proxies to the current Storage instance.

src/lib/component/ComponentFactory.cpp

@@ -11,16 +11,13 @@
 #include "gui/GuiFactory.h"
 
 std::shared_ptr<ComponentFactory> ComponentFactory::create(
-	GuiFactory* guiFactory,
-	ViewLayout* viewLayout,
-	std::shared_ptr<LocationAccess> locationAccess,
-	std::shared_ptr<GraphAccess> graphAccess)
-{
+	GuiFactory* guiFactory, ViewLayout* viewLayout, GraphAccess* graphAccess, LocationAccess* locationAccess
+){
 	std::shared_ptr<ComponentFactory> ptr(new ComponentFactory());
 	ptr->m_guiFactory = guiFactory;
 	ptr->m_viewLayout = viewLayout;
-	ptr->m_locationAccess = locationAccess;
 	ptr->m_graphAccess = graphAccess;
+	ptr->m_locationAccess = locationAccess;
 	return ptr;
 }
 

src/lib/component/ComponentFactory.h

@@ -14,10 +14,8 @@ class ComponentFactory
 {
 public:
 	static std::shared_ptr<ComponentFactory> create(
-		GuiFactory* guiFactory,
-		ViewLayout* viewLayout,
-		std::shared_ptr<LocationAccess> locationAccess,
-		std::shared_ptr<GraphAccess> graphAccess);
+		GuiFactory* guiFactory, ViewLayout* viewLayout, GraphAccess* graphAccess, LocationAccess* locationAccess
+	);
 
 	~ComponentFactory();
 
@@ -32,8 +30,8 @@ private:
 	GuiFactory* m_guiFactory;
 	ViewLayout* m_viewLayout;
 
-	std::shared_ptr<LocationAccess> m_locationAccess;
-	std::shared_ptr<GraphAccess> m_graphAccess;
+	GraphAccess* m_graphAccess;
+	LocationAccess* m_locationAccess;
 };
 
 

src/lib/component/ComponentManager.cpp

@@ -7,13 +7,10 @@
 #include "data/location/TokenLocationFile.h"
 
 std::shared_ptr<ComponentManager> ComponentManager::create(
-	GuiFactory* guiFactory,
-	ViewLayout* viewLayout,
-	std::shared_ptr<LocationAccess> locationAccess,
-	std::shared_ptr<GraphAccess> graphAccess)
-{
+	GuiFactory* guiFactory, ViewLayout* viewLayout, GraphAccess* graphAccess, LocationAccess* locationAccess
+){
 	std::shared_ptr<ComponentManager> ptr(new ComponentManager());
-	ptr->m_componentFactory = ComponentFactory::create(guiFactory, viewLayout, locationAccess, graphAccess);
+	ptr->m_componentFactory = ComponentFactory::create(guiFactory, viewLayout, graphAccess, locationAccess);
 
 	return ptr;
 }

src/lib/component/ComponentManager.h

@@ -16,10 +16,8 @@ class ComponentManager
 {
 public:
 	static std::shared_ptr<ComponentManager> create(
-		GuiFactory* guiFactory,
-		ViewLayout* viewLayout,
-		std::shared_ptr<LocationAccess> locationAccess,
-		std::shared_ptr<GraphAccess> graphAccess);
+		GuiFactory* guiFactory, ViewLayout* viewLayout, GraphAccess* graphAccess, LocationAccess* locationAccess
+	);
 
 	~ComponentManager();
 

src/lib/component/controller/CodeController.cpp

@@ -10,7 +10,7 @@
 #include "utility/logging/logging.h"
 
 
-CodeController::CodeController(std::shared_ptr<LocationAccess> locationAccess)
+CodeController::CodeController(LocationAccess* locationAccess)
 	: m_locationAccess(locationAccess)
 {
 }

src/lib/component/controller/CodeController.h

@@ -22,7 +22,7 @@ class CodeController
 	, public MessageListener<MessageActivateToken>
 {
 public:
-	CodeController(std::shared_ptr<LocationAccess> locationAccess);
+	CodeController(LocationAccess* locationAccess);
 	~CodeController();
 
 	void setActiveTokenId(Id id);
@@ -31,7 +31,7 @@ private:
 	virtual void handleMessage(MessageActivateToken* message);
 	CodeView* getView();
 
-	std::shared_ptr<LocationAccess> m_locationAccess;
+	LocationAccess* m_locationAccess;
 };
 
 

src/lib/component/controller/GraphController.cpp

@@ -7,7 +7,7 @@
 
 #include "utility/logging/logging.h"
 
-GraphController::GraphController(std::shared_ptr<GraphAccess> graphAccess)
+GraphController::GraphController(GraphAccess* graphAccess)
 	: m_graphAccess(graphAccess)
 {
 }

src/lib/component/controller/GraphController.h

@@ -14,14 +14,14 @@ class GraphController:
 	public MessageListener<MessageActivateToken>
 {
 public:
-	GraphController(std::shared_ptr<GraphAccess> graphAccess);
+	GraphController(GraphAccess* graphAccess);
 	~GraphController();
 
 private:
 	virtual void handleMessage(MessageActivateToken* message);
 	GraphView* getView();
 
-	std::shared_ptr<GraphAccess> m_graphAccess;
+	GraphAccess* m_graphAccess;
 };
 
 

src/lib/component/controller/SearchController.cpp

@@ -3,7 +3,7 @@
 #include "component/view/SearchView.h"
 #include "data/access/GraphAccess.h"
 
-SearchController::SearchController(std::shared_ptr<GraphAccess> graphAccess)
+SearchController::SearchController(GraphAccess* graphAccess)
 	: m_graphAccess(graphAccess)
 {
 }

src/lib/component/controller/SearchController.h

@@ -17,7 +17,7 @@ class SearchController
 	, public MessageListener<MessageFinishedParsing>
 {
 public:
-	SearchController(std::shared_ptr<GraphAccess> graphAccess);
+	SearchController(GraphAccess* graphAccess);
 	~SearchController();
 
 	void search(const std::string& s);
@@ -28,7 +28,7 @@ private:
 	virtual void handleMessage(MessageFinishedParsing* message);
 	SearchView* getView();
 
-	std::shared_ptr<GraphAccess> m_graphAccess;
+	GraphAccess* m_graphAccess;
 };
 
 #endif // SEARCH_CONTROLLER_H