diff options
| author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-01-14 02:44:30 +0100 |
|---|---|---|
| committer | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-01-14 02:44:30 +0100 |
| commit | fda708058907c6cfb803c883f1505c2cde7057a6 (patch) | |
| tree | 08a49dd6f053b5ef97e4ec253ea77577bd770b06 /src/core/model/Domain.hpp | |
| parent | 7d1b3c5df2eab1d42179332d467d5756aefed587 (diff) | |
| parent | c9c808971341c139d654c0e3eea3a461e700388a (diff) | |
Merge branch 'master' of somweyr.de:ousia
Diffstat (limited to 'src/core/model/Domain.hpp')
| -rw-r--r-- | src/core/model/Domain.hpp | 39 |
1 files changed, 5 insertions, 34 deletions
diff --git a/src/core/model/Domain.hpp b/src/core/model/Domain.hpp index 755ff52..1f65242 100644 --- a/src/core/model/Domain.hpp +++ b/src/core/model/Domain.hpp @@ -233,7 +233,7 @@ class Domain; * As an example consider the "paragraph" StructuredClass, which might allow * the actual text content. Here is the according XML: * - * \code{*.xml} + * \code{.xml} * <struct name="paragraph" transparent="true" role="paragraph"> * <fields> * <field> @@ -376,7 +376,7 @@ public: * explained as the difference between node attributes and node children. * Consider the XML * - * \code{*.xml} + * \code{.xml} * <A key="value"> * <key>value</key> * </A> @@ -490,7 +490,7 @@ typedef RangeSet<size_t> Cardinality; * defining itself as a viable child in one existing field. Consider the * example of the "heading" domain from the header documentation again: * - * \code{*.xml} + * \code{.xml} * <domain name="headings"> * <head> * <import rel="domain" src="book.oxm"/> @@ -522,7 +522,7 @@ typedef RangeSet<size_t> Cardinality; * If we go back to our example a user would (without transparency) have to * explicitly declare: * - * \code{*.xml} + * \code{.xml} * <book> * <section> * <paragraph>Text.</paragraph> @@ -532,7 +532,7 @@ typedef RangeSet<size_t> Cardinality; * * But in our mind the document * - * \code{*.xml} + * \code{.xml} * <book> * <section> * Text. @@ -558,7 +558,6 @@ class StructuredClass : public Descriptor { private: const Cardinality cardinality; Owned<StructuredClass> isa; - NodeVector<FieldDescriptor> parents; public: const bool transparent; @@ -599,7 +598,6 @@ public: : Descriptor(mgr, std::move(name), domain, attributesDescriptor), cardinality(cardinality), isa(acquire(isa)), - parents(this), transparent(transparent), root(root) { @@ -620,33 +618,6 @@ public: * hierarchy (!). */ Rooted<StructuredClass> getIsA() const { return isa; } - - /** - * Returns a const reference to the NodeVector of FieldDescriptors that - * should allow an instance of this StructuredClass as child in the - * Structure Tree. This enables you to "invade" other domains as described - * in the StructuredClass documentation. - * - * @return a const reference to the NodeVector of FieldDescriptors that - * should allow an instance of this StructuredClass as child in the - * Structure Tree. - */ - const NodeVector<FieldDescriptor> &getParents() const { return parents; } - - /** - * Adds a FieldDescriptor that should allow an instance of this - * StructuredClass as a child in the Structure Tree. - */ - void addParent(Handle<FieldDescriptor> p) { parents.push_back(p); } - - /** - * Adds multiple FieldDescriptors that should allow an instance of this - * StructuredClass as a child in the Structure Tree. - */ - void addParents(const std::vector<Handle<FieldDescriptor>> &ps) - { - parents.insert(parents.end(), ps.begin(), ps.end()); - } }; /** |