From 192794c711571f1689a62d56342c1c9ef1ccc805 Mon Sep 17 00:00:00 2001
From: Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de>
Date: Fri, 9 Jan 2015 15:33:03 +0100
Subject: removed resolve debug printouts and simplified resolve method in
 Document.

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

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

diff --git a/src/core/model/Document.cpp b/src/core/model/Document.cpp
index 912a04e..d01fbd6 100644
--- a/src/core/model/Document.cpp
+++ b/src/core/model/Document.cpp
@@ -93,18 +93,9 @@ NodeVector<StructuredEntity> &DocumentEntity::getField(
 
 void Document::continueResolve(ResolutionState &state)
 {
-	// Try to resolve annotations and other document nodes first
-	bool hasResult =
-	    continueResolveComposita(annotations, annotations.getIndex(), state);
-	if (root != nullptr) {
-		hasResult = hasResult | continueResolveCompositum(root, state);
-	}
-
-	// If no direct child has been found, continue resolving the referenced
-	// domains
-	if (!hasResult) {
-		continueResolveReferences(domains, state);
-	}
+	continueResolveComposita(annotations, annotations.getIndex(), state);
+	continueResolveCompositum(root, state);
+	continueResolveReferences(domains, state);
 }
 }
 
-- 
cgit v1.2.3