diff options
| author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2014-12-16 21:09:11 +0100 |
|---|---|---|
| committer | Andreas Stöckel <andreas@somweyr.de> | 2014-12-16 21:09:11 +0100 |
| commit | 0b4f9d0cb880bb1baa041c867e0a4bf191b0dfa2 (patch) | |
| tree | 5497e6cf99f6f3897bfab6a69e2c97f1c4254605 /src/core/model/Domain.hpp | |
| parent | f4c7acff280aa4ca76f90480fd3d09be7f8d0bef (diff) | |
| parent | 257c76122ad7db19382c66985d89815df676e45a (diff) | |
Merge branch 'master' of somweyr.de:ousia
Diffstat (limited to 'src/core/model/Domain.hpp')
| -rw-r--r-- | src/core/model/Domain.hpp | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/src/core/model/Domain.hpp b/src/core/model/Domain.hpp index 535330c..50c0bb1 100644 --- a/src/core/model/Domain.hpp +++ b/src/core/model/Domain.hpp @@ -250,7 +250,12 @@ public: } // TODO: Is returning a ManagedVector alright? - ManagedVector<FieldDescriptor> getFieldDescriptors() const + ManagedVector<FieldDescriptor> &getFieldDescriptors() + { + return fieldDescriptors; + } + + const ManagedVector<FieldDescriptor> &getFieldDescriptors() const { return fieldDescriptors; } @@ -350,8 +355,7 @@ public: const Cardinality &cardinality, // TODO: What would be a wise default value for isa? Handle<StructuredClass> isa, - ManagedVector<FieldDescriptor> parents, - bool transparent) + ManagedVector<FieldDescriptor> parents, bool transparent) : Descriptor(mgr, std::move(name), parent, attributesDescriptor, fieldDescriptors), cardinality(cardinality), @@ -363,10 +367,12 @@ public: const Cardinality &getCardinality() const { return cardinality; } - Rooted<StructuredClass> getIsA() const {return isa;} + Rooted<StructuredClass> getIsA() const { return isa; } // TODO: Is returning a ManagedVector alright? - ManagedVector<FieldDescriptor> getParents() { return parents; } + ManagedVector<FieldDescriptor>& getParents() { return parents; } + + const ManagedVector<FieldDescriptor> &getParents() const { return parents; } }; /** @@ -391,8 +397,8 @@ private: public: Domain(Manager &mgr, std::string name, - ManagedVector<StructuredClass> rootStructures, - ManagedVector<AnnotationClass> annotationClasses) + ManagedVector<StructuredClass> rootStructures, + ManagedVector<AnnotationClass> annotationClasses) // TODO: Can a domain have a parent? : Node(mgr, std::move(name), nullptr), rootStructures(rootStructures), |