From 2f75ac166594b6bc2ea30901669304eca23174ec Mon Sep 17 00:00:00 2001
From: Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de>
Date: Wed, 11 Feb 2015 17:54:48 +0100
Subject: changed semantics of default field, now referring to the only TREE
 field.

---
 src/plugins/html/DemoOutput.cpp | 2 +-
 src/plugins/xml/XmlParser.cpp   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/plugins')

diff --git a/src/plugins/html/DemoOutput.cpp b/src/plugins/html/DemoOutput.cpp
index d041c1d..cb34cbe 100644
--- a/src/plugins/html/DemoOutput.cpp
+++ b/src/plugins/html/DemoOutput.cpp
@@ -324,7 +324,7 @@ Rooted<xml::Element> DemoHTMLTransformer::transformParagraph(
 		if (childDescriptorName == "text") {
 			Handle<DocumentPrimitive> primitive =
 			    t->getField()[0].cast<DocumentPrimitive>();
-			if (primitive.isNull()) {
+			if (primitive == nullptr) {
 				throw OusiaException("Text field is not primitive!");
 			}
 			current->addChild(new xml::Text(
diff --git a/src/plugins/xml/XmlParser.cpp b/src/plugins/xml/XmlParser.cpp
index 22498f4..d7efa4d 100644
--- a/src/plugins/xml/XmlParser.cpp
+++ b/src/plugins/xml/XmlParser.cpp
@@ -603,7 +603,7 @@ public:
 		    [](Handle<Node> field, Handle<Node> parent, Logger &logger) {
 			    if (field != nullptr) {
 				    parent.cast<StructuredClass>()->addFieldDescriptor(
-				        field.cast<FieldDescriptor>());
+				        field.cast<FieldDescriptor>(), logger);
 			    }
 			});
 	}
@@ -969,7 +969,7 @@ static const ParserState DomainField =
         .parents({&DomainStruct, &DomainAnnotation})
         .createdNodeType(&RttiTypes::FieldDescriptor)
         .elementHandler(DomainFieldHandler::create)
-        .arguments({Argument::String("name", DEFAULT_FIELD_NAME),
+        .arguments({Argument::String("name", ""),
                     Argument::Bool("isSubtree", false),
                     Argument::Bool("optional", false)});
 
@@ -985,7 +985,7 @@ static const ParserState DomainStructPrimitive =
         .parents({&DomainStruct, &DomainAnnotation})
         .createdNodeType(&RttiTypes::FieldDescriptor)
         .elementHandler(DomainPrimitiveHandler::create)
-        .arguments({Argument::String("name", DEFAULT_FIELD_NAME),
+        .arguments({Argument::String("name", ""),
                     Argument::Bool("isSubtree", false),
                     Argument::Bool("optional", false),
                     Argument::String("type")});
@@ -1008,7 +1008,7 @@ static const ParserState DomainStructParentField =
         .parent(&DomainStructParent)
         .createdNodeType(&RttiTypes::FieldDescriptor)
         .elementHandler(DomainParentFieldHandler::create)
-        .arguments({Argument::String("name", DEFAULT_FIELD_NAME),
+        .arguments({Argument::String("name", ""),
                     Argument::Bool("isSubtree", false),
                     Argument::Bool("optional", false)});
 
-- 
cgit v1.2.3