From 51de9238ddbd6b7f4cdaa5e9a5918cae952891b2 Mon Sep 17 00:00:00 2001
From: Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de>
Date: Mon, 12 Jan 2015 15:50:10 +0100
Subject: Tried to introduce another StructureNode class as common superclass
 for StructuredEntity, Anchor and DocumentPrimitive. Nearly seems to work, but
 not entirely so. There are still issues with the Manager it seems.

---
 src/core/model/Document.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/core/model/Document.cpp')

diff --git a/src/core/model/Document.cpp b/src/core/model/Document.cpp
index f591095..723aafd 100644
--- a/src/core/model/Document.cpp
+++ b/src/core/model/Document.cpp
@@ -111,13 +111,15 @@ const Rtti<model::Document> Document =
 const Rtti<model::AnnotationEntity> AnnotationEntity =
     RttiBuilder("AnnotationEntity").parent(&DocumentEntity).composedOf(
         &StructuredEntity);
+const Rtti<model::StructureNode> StructureNode =
+    RttiBuilder("StructureNode").parent(&Node);
 const Rtti<model::StructuredEntity> StructuredEntity =
-    RttiBuilder("StructuredEntity").parent(&DocumentEntity).composedOf(
+    RttiBuilder("StructuredEntity").parent(&DocumentEntity).parent(&StructureNode).composedOf(
         {&StructuredEntity, &Anchor, &DocumentPrimitive});
 const Rtti<model::DocumentPrimitive> DocumentPrimitive =
-    RttiBuilder("DocumentPrimitive").parent(&StructuredEntity);
+    RttiBuilder("DocumentPrimitive").parent(&StructureNode);
 const Rtti<model::AnnotationEntity::Anchor> Anchor =
-    RttiBuilder("Anchor").parent(&StructuredEntity);
+    RttiBuilder("Anchor").parent(&StructureNode);
 }
 }
 
-- 
cgit v1.2.3