Removed dependency between "Project" model class and parser/resources. This reduces coupling and was stupid beforehand.

1 files changed, 2 insertions, 102 deletions

diff --git a/src/core/model/Project.hpp b/src/core/model/Project.hpp
index 1c33dc8..9b81058 100644
--- a/src/core/model/Project.hpp
+++ b/src/core/model/Project.hpp
@@ -28,8 +28,6 @@
 #ifndef _OUSIA_PROJECT_HPP_
 #define _OUSIA_PROJECT_HPP_
 
-#include <core/resource/ResourceManager.hpp>
-
 #include "Node.hpp"
 
 namespace ousia {
@@ -38,7 +36,6 @@ namespace ousia {
 class Logger;
 class Rtti;
 class Registry;
-class ParserContext;
 class SystemTypesystem;
 class Typesystem;
 class Document;
@@ -52,11 +49,6 @@ class Domain;
 class Project : public Node {
 private:
 	/**
-	 * Reference at the internally used Registry instance.
-	 */
-	Registry &registry;
-
-	/**
 	 * Private instance of the system typesystem which is distributed as a
 	 * reference to all child typesystems.
 	 */
@@ -67,109 +59,17 @@ private:
 	 */
 	NodeVector<Document> documents;
 
-	/**
-	 * ResourceManager used to manage all resources used by the project.
-	 */
-	ResourceManager resourceManager;
-
 protected:
-	/**
-	 * Validates the project and all parts it consists of.
-	 *
-	 * @param logger is the logger instance to which errors will be logged.
-	 */
 	bool doValidate(Logger &loger) const override;
+	void doResolve(ResolutionState &state) override;
 
 public:
 	/**
 	 * Constructor of the Project class.
 	 *
 	 * @param mgr is the manager instance used for managing this Node.
-	 * @param registry is the registry instance that should be used for locating
-	 * files and finding parsers for these files.
-	 */
-	Project(Manager &mgr, Registry &registry);
-
-	/**
-	 * Parses a file with the given Logger in an empty ParserScope. This
-	 * function is meant to be called by the top-level (e.g. a main function)
-	 * and not by other parsers. These should use the link and include methods
-	 * instead.
-	 *
-	 * @param path is the path of the file that should be parsed.
-	 * @param mimetype is the mimetype of the resource that should be parsed
-	 * (may be empty, in which case the mimetype is deduced from the file
-	 * extension).
-	 * @param rel is a "relation string" supplied by the user which specifies
-	 * the relationship of the specified resource. May be empty, in which case
-	 * the relation is deduced from the supported types and the types of the
-	 * parser for the given mimetype.
-	 * @param supportedTypes contains the types of the returned Node the caller
-	 * can deal with. Note that only the types the parser claims to return are
-	 * checked, not the actual result.
-	 * @param logger is the logger that should be used
-	 * @return the parsed node or nullptr if something goes wrong.
-	 */
-	Rooted<Node> parse(const std::string &path, const std::string mimetype,
-	                   const std::string rel, const RttiSet &supportedTypes,
-	                   Logger &logger);
-
-	/**
-	 * Parses a file with ParserContext and an empty ParserScope. The parsed
-	 * object graph of files that are parsed using the "link" function is
-	 * cached (in contrast to the "include" function).
-	 *
-	 * @param ctx is the ParserContext that should be passed to the underlying
-	 * parser. The scope in the ParserContext will be exchanged.
-	 * @param path is the path of the file that should be parsed.
-	 * @param mimetype is the mimetype of the resource that should be parsed
-	 * (may be empty, in which case the mimetype is deduced from the file
-	 * extension).
-	 * @param rel is a "relation string" supplied by the user which specifies
-	 * the relationship of the specified resource. May be empty, in which case
-	 * the relation is deduced from the supported types and the types of the
-	 * parser for the given mimetype.
-	 * @param supportedTypes contains the types of the returned Node the caller
-	 * can deal with. Note that only the types the parser claims to return are
-	 * checked, not the actual result.
-	 * @return the parsed node or nullptr if something goes wrong.
-	 */
-	Rooted<Node> link(ParserContext &ctx, const std::string &path,
-	                  const std::string mimetype, const std::string rel,
-	                  const RttiSet &supportedTypes);
-
-	/**
-	 * Parses a file with ParserContext and the current ParserScope. In contrast
-	 * to the "link" function, include() does not cache the parsed node (as it
-	 * depends on the current ParserScope).
-	 *
-	 * @param ctx is the ParserContext that should be passed to the underlying
-	 * parser. The scope in the ParserContext will be exchanged.
-	 * @param path is the path of the file that should be parsed.
-	 * @param mimetype is the mimetype of the resource that should be parsed
-	 * (may be empty, in which case the mimetype is deduced from the file
-	 * extension).
-	 * @param rel is a "relation string" supplied by the user which specifies
-	 * the relationship of the specified resource. May be empty, in which case
-	 * the relation is deduced from the supported types and the types of the
-	 * parser for the given mimetype.
-	 * @param supportedTypes contains the types of the returned Node the caller
-	 * can deal with. Note that only the types the parser claims to return are
-	 * checked, not the actual result.
-	 * @return the parsed node or nullptr if something goes wrong.
-	 */
-	Rooted<Node> include(ParserContext &ctx, const std::string &path,
-	                     const std::string mimetype, const std::string rel,
-	                     const RttiSet &supportedTypes);
-
-	/**
-	 * Returns a SourceContextCallback that can be passed to a logger instance.
-	 * Remeber to reset the SourceContextCallback after the Project instance has
-	 * been freed.
-	 *
-	 * @return a SourceContextCallback that is coupled to this Project instance.
 	 */
-	SourceContextCallback getSourceContextCallback();
+	Project(Manager &mgr);
 
 	/**
 	 * Returns a reference to the internal system typesystem.