X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=xmltooling%2FXMLObject.h;h=8ebb60755f5ff0c9b1f58fd222847d416df5d670;hb=6f80ef82fc120408b0b242d35f77dd92213ba318;hp=d61ac84c9871c39985bae95ac96474f2570e9743;hpb=bd026f07e729e66127b3efd48aee443fba815af3;p=shibboleth%2Fcpp-xmltooling.git

diff --git a/xmltooling/XMLObject.h b/xmltooling/XMLObject.h
index d61ac84..8ebb607 100644
--- a/xmltooling/XMLObject.h
+++ b/xmltooling/XMLObject.h
@@ -1,17 +1,21 @@
-/*
- *  Copyright 2001-2009 Internet2
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the University Corporation for Advanced Internet
+ * Development, Inc. (UCAID) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * UCAID licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the
+ * License at
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
  */
 
 /**
@@ -122,11 +126,18 @@ namespace xmltooling {
         /**
          * Gets the value of the ID attribute set on this object, if any.
          * 
-         * @return an ID value or NULL 
+         * @return an ID value or nullptr 
          */
         virtual const XMLCh* getXMLID() const=0;
 
         /**
+         * Returns the xml:lang property of the object, if any.
+         *
+         * @return  an xml:lang value, or nullptr
+         */
+        virtual const XMLCh* getLang() const;
+
+        /**
          * Returns the xsi:nil property of the object, or false if not set.
          * 
          * @return	the xsi:nil property
@@ -234,7 +245,7 @@ namespace xmltooling {
         /**
          * Sets (or clears) text content relative to a child element's position. 
          * 
-         * @param value         value to set, or NULL to clear
+         * @param value         value to set, or nullptr to clear
          * @param position      position relative to child element 
          */
         virtual void setTextContent(const XMLCh* value, unsigned int position=0)=0;
@@ -299,7 +310,7 @@ namespace xmltooling {
          * a new document will be created and bound to the lifetime of the root object being
          * marshalled, unless an existing DOM can be reused without creating a new document. 
          * 
-         * @param document  the DOM document the marshalled element will be placed in, or NULL
+         * @param document  the DOM document the marshalled element will be placed in, or nullptr
          * @param sigs      ordered array of signatures to create after marshalling is complete
          * @param credential    optional credential to supply signing key and related info
          * @return the DOM element representing this XMLObject
@@ -308,10 +319,10 @@ namespace xmltooling {
          * @throws SignatureException thrown if a problem occurs during signature creation 
          */
         virtual xercesc::DOMElement* marshall(
-            xercesc::DOMDocument* document=NULL
+            xercesc::DOMDocument* document=nullptr
 #ifndef XMLTOOLING_NO_XMLSEC
-            ,const std::vector<xmlsignature::Signature*>* sigs=NULL
-            ,const Credential* credential=NULL
+            ,const std::vector<xmlsignature::Signature*>* sigs=nullptr
+            ,const Credential* credential=nullptr
 #endif
             ) const=0;
         
@@ -332,8 +343,8 @@ namespace xmltooling {
         virtual xercesc::DOMElement* marshall(
             xercesc::DOMElement* parentElement
 #ifndef XMLTOOLING_NO_XMLSEC
-            ,const std::vector<xmlsignature::Signature*>* sigs=NULL
-            ,const Credential* credential=NULL
+            ,const std::vector<xmlsignature::Signature*>* sigs=nullptr
+            ,const Credential* credential=nullptr
 #endif
             ) const=0;