From 988fac434d2450998cbce85e338cb1534acfa808 Mon Sep 17 00:00:00 2001 From: Benjamin Paassen Date: Sun, 15 Feb 2015 23:09:18 +0100 Subject: changed order of fields in StructuredClass::getFieldDescriptors --- src/core/model/Domain.hpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'src/core/model/Domain.hpp') diff --git a/src/core/model/Domain.hpp b/src/core/model/Domain.hpp index 081435a..350c7ba 100644 --- a/src/core/model/Domain.hpp +++ b/src/core/model/Domain.hpp @@ -791,9 +791,9 @@ private: /** * Helper method for getFieldDescriptors. */ - void gatherFieldDescriptors(NodeVector ¤t, - std::set &overriddenFields, - bool hasTREE) const; + Rooted gatherFieldDescriptors( + NodeVector ¤t, + std::set &overriddenFields, bool hasTREE) const; protected: bool doValidate(Logger &logger) const override; @@ -915,10 +915,14 @@ public: void removeSubclass(Handle sc, Logger &logger); /** - * Returns a const reference to the NodeVector of all FieldDescriptors of + * Returns a NodeVector of all FieldDescriptors of * this StructuredClass. This also merges the FieldDescriptors directly * belonging to this StructuredClass with all FieldDescritptors of its - * Superclass (and so on recurvively). + * Superclass (and so on recurvively). The order of field descriptors is + * as follows: + * 1.) non-overridden SUBTREE FieldDescriptors of super classes. + * 2.) SUBTREE FieldDescriptors of this class. + * 3.) TREE FieldDescriptor (either inherited from super class or direct) * * @return a NodeVector of all FieldDescriptors of this StructuredClass. */ -- cgit v1.2.3