replaces ManagedVector by NodeVector in Model classes.

3 files changed, 41 insertions, 41 deletions

diff --git a/src/core/model/Document.cpp b/src/core/model/Document.cpp
index 709981b..497bb43 100644
--- a/src/core/model/Document.cpp
+++ b/src/core/model/Document.cpp
@@ -25,7 +25,7 @@ namespace model {
 
 int DocumentEntity::getFieldDescriptorIndex(const std::string &fieldName)
 {
-	const ManagedVector<FieldDescriptor> &fds =
+	const NodeVector<FieldDescriptor> &fds =
 	    descriptor->getFieldDescriptors();
 	unsigned int f = 0;
 
@@ -57,21 +57,21 @@ int DocumentEntity::getFieldDescriptorIndex(const std::string &fieldName)
 	return -1;
 }
 
-void DocumentEntity::getField(ManagedVector<StructuredEntity> &res,
+void DocumentEntity::getField(NodeVector<StructuredEntity> &res,
                               const std::string &fieldName)
 {
 	int f = getFieldDescriptorIndex(fieldName);
 	if (f < 0) {
-		ManagedVector<StructuredEntity> empty{this};
-		res = ManagedVector<StructuredEntity>(this);
+		NodeVector<StructuredEntity> empty{this};
+		res = NodeVector<StructuredEntity>(this);
 	}
 	res = fields[f];
 }
 
-ManagedVector<StructuredEntity> &DocumentEntity::getField(
+NodeVector<StructuredEntity> &DocumentEntity::getField(
     Rooted<FieldDescriptor> fieldDescriptor)
 {
-	const ManagedVector<FieldDescriptor> &fds =
+	const NodeVector<FieldDescriptor> &fds =
 	    descriptor->getFieldDescriptors();
 	int f = 0;
 	for (auto &fd : fds) {
@@ -156,7 +156,7 @@ Rooted<StructuredEntity> StructuredEntity::buildEntity(
 		return {nullptr};
 	}
 	// append the new entity to the right field.
-	ManagedVector<StructuredEntity> field{parent};
+	NodeVector<StructuredEntity> field{parent};
 	parent->getField(field, fieldName);
 	field.push_back(entity);
 
@@ -180,7 +180,7 @@ Rooted<DocumentPrimitive> DocumentPrimitive::buildEntity(
 		return {nullptr};
 	}
 	// append the new entity to the right field.
-	ManagedVector<StructuredEntity> field{parent};
+	NodeVector<StructuredEntity> field{parent};
 	parent->getField(field, fieldName);
 	field.push_back(entity);
 
diff --git a/src/core/model/Document.hpp b/src/core/model/Document.hpp
index 15a4599..a660da7 100644
--- a/src/core/model/Document.hpp
+++ b/src/core/model/Document.hpp
@@ -97,7 +97,7 @@ class DocumentEntity : public Node {
 private:
 	Owned<Descriptor> descriptor;
 	const Variant attributes;
-	std::vector<ManagedVector<StructuredEntity>> fields;
+	std::vector<NodeVector<StructuredEntity>> fields;
 
 	int getFieldDescriptorIndex(const std::string &fieldName);
 
@@ -114,7 +114,7 @@ public:
 		if (!descriptor.isNull()) {
 			for (size_t f = 0; f < descriptor->getFieldDescriptors().size();
 			     f++) {
-				fields.push_back(ManagedVector<StructuredEntity>(this));
+				fields.push_back(NodeVector<StructuredEntity>(this));
 			}
 		}
 	}
@@ -127,7 +127,7 @@ public:
 	 * This allows a direct manipulation of the internal data structure of a
 	 * DocumentEntity and is not recommended. TODO: Delete this?
 	 */
-	std::vector<ManagedVector<StructuredEntity>> &getFields() { return fields; }
+	std::vector<NodeVector<StructuredEntity>> &getFields() { return fields; }
 
 	/**
 	 * This returns true if there is a FieldDescriptor in the Descriptor for
@@ -155,7 +155,7 @@ public:
 	 * 2.) the only FieldDescriptor (if only one is specified).
 	 *
 	 * Note that the output of this method might well be ambigous: If no
-	 * FieldDescriptor matches the given name an empty ManagedVector is
+	 * FieldDescriptor matches the given name an empty NodeVector is
 	 * returned. This is also the case, however, if there are no members for an
 	 * existing field. Therefore it is recommended to additionally check the
 	 * output of "hasField" or use the version of this method with
@@ -163,13 +163,13 @@ public:
 	 *
 	 * @param fieldName is the name of the field as specified in the
 	 *                  FieldDescriptor in the Domain description.
-	 * @param res       is a ManagedVector reference where the result will be
+	 * @param res       is a NodeVector reference where the result will be
 	 *                  stored. After using this method the reference will
 	 *                  either refer to all StructuredEntities in that field. If
 	 *                  the field is unknown or if no members exist in that
-	 *                  field yet, the ManagedVector will be empty.
+	 *                  field yet, the NodeVector will be empty.
 	 */
-	void getField(ManagedVector<StructuredEntity> &res,
+	void getField(NodeVector<StructuredEntity> &res,
 	              const std::string &fieldName = "");
 
 	/**
@@ -181,9 +181,9 @@ public:
 	 *
 	 * @param fieldDescriptor is a FieldDescriptor defined in the Descriptor for
 	 *                        this DocumentEntity.
-	 * @return a ManagedVector of all StructuredEntities in that field.
+	 * @return a NodeVector of all StructuredEntities in that field.
 	 */
-	ManagedVector<StructuredEntity> &getField(
+	NodeVector<StructuredEntity> &getField(
 	    Rooted<FieldDescriptor> fieldDescriptor);
 };
 
@@ -193,7 +193,7 @@ public:
  */
 class StructuredEntity : public DocumentEntity {
 private:
-	ManagedVector<AnnotationEntity> annotations;
+	NodeVector<AnnotationEntity> annotations;
 
 public:
 	StructuredEntity(Manager &mgr, Handle<Node> parent,
@@ -205,7 +205,7 @@ public:
 	{
 	}
 
-	ManagedVector<AnnotationEntity> &getAnnotations() { return annotations; }
+	NodeVector<AnnotationEntity> &getAnnotations() { return annotations; }
 
 	/**
 	 * This builds the root StructuredEntity for the given document. It
diff --git a/src/core/model/Domain.hpp b/src/core/model/Domain.hpp
index 112f2fa..d0227bd 100644
--- a/src/core/model/Domain.hpp
+++ b/src/core/model/Domain.hpp
@@ -135,7 +135,7 @@ public:
 	enum class FieldType { TREE, SUBTREE, PRIMITIVE };
 
 private:
-	ManagedVector<StructuredClass> children;
+	NodeVector<StructuredClass> children;
 	FieldType fieldType;
 	Owned<Type> primitiveType;
 
@@ -200,10 +200,10 @@ public:
 	{
 	}
 
-	// TODO: Is returning a ManagedVector alright?
-	ManagedVector<StructuredClass> &getChildren() { return children; }
+	// TODO: Is returning a NodeVector alright?
+	NodeVector<StructuredClass> &getChildren() { return children; }
 
-	const ManagedVector<StructuredClass> &getChildren() const
+	const NodeVector<StructuredClass> &getChildren() const
 	{
 		return children;
 	}
@@ -245,7 +245,7 @@ public:
 class Descriptor : public Node {
 private:
 	Owned<StructType> attributesDescriptor;
-	ManagedVector<FieldDescriptor> fieldDescriptors;
+	NodeVector<FieldDescriptor> fieldDescriptors;
 
 protected:
 	void doResolve(std::vector<Rooted<Managed>> &res,
@@ -268,13 +268,13 @@ public:
 		return attributesDescriptor;
 	}
 
-	// TODO: Is returning a ManagedVector alright?
-	ManagedVector<FieldDescriptor> &getFieldDescriptors()
+	// TODO: Is returning a NodeVector alright?
+	NodeVector<FieldDescriptor> &getFieldDescriptors()
 	{
 		return fieldDescriptors;
 	}
 
-	const ManagedVector<FieldDescriptor> &getFieldDescriptors() const
+	const NodeVector<FieldDescriptor> &getFieldDescriptors() const
 	{
 		return fieldDescriptors;
 	}
@@ -361,7 +361,7 @@ class StructuredClass : public Descriptor {
 private:
 	const Cardinality cardinality;
 	Owned<StructuredClass> isa;
-	ManagedVector<FieldDescriptor> parents;
+	NodeVector<FieldDescriptor> parents;
 
 protected:
 	void doResolve(std::vector<Rooted<Managed>> &res,
@@ -390,10 +390,10 @@ public:
 
 	Rooted<StructuredClass> getIsA() const { return isa; }
 
-	// TODO: Is returning a ManagedVector alright?
-	ManagedVector<FieldDescriptor> &getParents() { return parents; }
+	// TODO: Is returning a NodeVector alright?
+	NodeVector<FieldDescriptor> &getParents() { return parents; }
 
-	const ManagedVector<FieldDescriptor> &getParents() const { return parents; }
+	const NodeVector<FieldDescriptor> &getParents() const { return parents; }
 };
 
 /**
@@ -413,9 +413,9 @@ class AnnotationClass : public Descriptor {
  */
 class Domain : public Node {
 private:
-	ManagedVector<StructuredClass> rootStructures;
-	ManagedVector<AnnotationClass> annotationClasses;
-	ManagedVector<Typesystem> typesystems;
+	NodeVector<StructuredClass> rootStructures;
+	NodeVector<AnnotationClass> annotationClasses;
+	NodeVector<Typesystem> typesystems;
 
 protected:
 	void doResolve(std::vector<Rooted<Managed>> &res,
@@ -433,30 +433,30 @@ public:
 	{
 	}
 
-	// TODO: Is returning a ManagedVector alright?
-	ManagedVector<StructuredClass> &getRootStructures()
+	// TODO: Is returning a NodeVector alright?
+	NodeVector<StructuredClass> &getRootStructures()
 	{
 		return rootStructures;
 	}
 
-	const ManagedVector<StructuredClass> &getRootStructures() const
+	const NodeVector<StructuredClass> &getRootStructures() const
 	{
 		return rootStructures;
 	}
 
-	ManagedVector<AnnotationClass> &getAnnotationClasses()
+	NodeVector<AnnotationClass> &getAnnotationClasses()
 	{
 		return annotationClasses;
 	}
 
-	const ManagedVector<AnnotationClass> &getAnnotationClasses() const
+	const NodeVector<AnnotationClass> &getAnnotationClasses() const
 	{
 		return annotationClasses;
 	}
 
-	ManagedVector<Typesystem> &getTypesystems() { return typesystems; }
+	NodeVector<Typesystem> &getTypesystems() { return typesystems; }
 
-	const ManagedVector<Typesystem> &getTypesystems() const
+	const NodeVector<Typesystem> &getTypesystems() const
 	{
 		return typesystems;
 	}