/*
- * Copyright 2001-2009 Internet2
+ * Copyright 2001-2010 Internet2
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
/**
* AbstractSimpleElement.cpp
*
- * Extension of AbstractXMLObject that implements simple elements
+ * Extension of AbstractXMLObject that implements simple elements.
*/
#include "internal.h"
#include "AbstractSimpleElement.h"
+#include <xercesc/util/XMLChar.hpp>
+
using namespace xmltooling;
using xercesc::XMLString;
+using xercesc::XMLChar1_0;
using namespace std;
// shared "empty" list of children for childless objects
list<XMLObject*> AbstractSimpleElement::m_no_children;
-AbstractSimpleElement::AbstractSimpleElement() : m_value(NULL)
+AbstractSimpleElement::AbstractSimpleElement() : m_value(nullptr)
{
}
const XMLCh* AbstractSimpleElement::getTextContent(unsigned int position) const
{
- return (position==0) ? m_value : NULL;
+ return (position==0) ? m_value : nullptr;
}
void AbstractSimpleElement::setTextContent(const XMLCh* value, unsigned int position)
{
if (position > 0)
throw XMLObjectException("Cannot set text content in simple element at position > 0.");
- m_value=prepareForAssignment(m_value,value);
+
+ // We overwrite the "one" piece of Text content if:
+ // - the new value is null
+ // - there is no existing value
+ // - the old value is all whitespace
+ // If there's a non-whitespace value set, we leave it alone unless we're clearing it with a null.
+
+ if (!value || !m_value || XMLChar1_0::isAllSpaces(m_value, XMLString::stringLen(m_value)))
+ m_value=prepareForAssignment(m_value, value);
}