Return-Path: Delivered-To: apmail-ws-axis-cvs-archive@www.apache.org Received: (qmail 15997 invoked from network); 21 Feb 2005 13:46:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 21 Feb 2005 13:46:58 -0000 Received: (qmail 55294 invoked by uid 500); 21 Feb 2005 13:46:57 -0000 Delivered-To: apmail-ws-axis-cvs-archive@ws.apache.org Received: (qmail 54961 invoked by uid 500); 21 Feb 2005 13:46:56 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 54947 invoked by uid 99); 21 Feb 2005 13:46:56 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Mon, 21 Feb 2005 05:46:56 -0800 Received: (qmail 15976 invoked by uid 1877); 21 Feb 2005 13:46:55 -0000 Date: 21 Feb 2005 13:46:55 -0000 Message-ID: <20050221134655.15975.qmail@minotaur.apache.org> From: dicka@apache.org To: ws-axis-cvs@apache.org Subject: cvs commit: ws-axis/c/src/soap Namespace.cpp Namespace.h X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N dicka 2005/02/21 05:46:54 Modified: c/include/axis INamespace.hpp c/src/soap Namespace.cpp Namespace.h Log: Change return type of setURI() and setPrefix() in INamespace class to int PR: AXISCPP-448 Submitted by: Adrian Dick Revision Changes Path 1.2 +27 -2 ws-axis/c/include/axis/INamespace.hpp Index: INamespace.hpp =================================================================== RCS file: /home/cvs/ws-axis/c/include/axis/INamespace.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- INamespace.hpp 12 Jan 2005 13:50:30 -0000 1.1 +++ INamespace.hpp 21 Feb 2005 13:46:54 -0000 1.2 @@ -40,10 +40,35 @@ class INamespace { public: + /** + * Gets the prefix of this Namespace. + * + * @return prefix of this namespace. + */ virtual const AxisChar* getPrefix()=0; + + /** + * Gets the namespace uri of this Namespace. + * + * @return namespace uri of this Namespace + */ virtual const AxisChar* getURI()=0; - virtual void setURI(const AxisChar* achURI)=0; - virtual void setPrefix(const AxisChar* achPrefix)=0; + + /** + * Sets the namespace uri of this Namespace. + * + * @param uri The namespace uri to set in. + * @return AXIS_SUCCESS if successful AXIS_FAIL otherwise. NOTE: Passing NULL will result in a AXIS_FAIL + * + */ + virtual int setURI(const AxisChar* achURI)=0; + /** + * Sets the prefix of this Namespace. + * + * @param prefix The prefix to set in. + * @return AXIS_SUCCESS if successful AXIS_FAIL otherwise. NOTE: Passing NULL will result in a AXIS_FAIL + */ + virtual int setPrefix(const AxisChar* achPrefix)=0; virtual ~INamespace() {}; }; 1.3 +14 -4 ws-axis/c/src/soap/Namespace.cpp Index: Namespace.cpp =================================================================== RCS file: /home/cvs/ws-axis/c/src/soap/Namespace.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Namespace.cpp 31 Jan 2005 13:00:53 -0000 1.2 +++ Namespace.cpp 21 Feb 2005 13:46:54 -0000 1.3 @@ -43,14 +43,24 @@ m_asURI = achURI; } -void Namespace::setPrefix(const AxisChar* achPrefix) +int Namespace::setPrefix(const AxisChar* achPrefix) { - m_asPrefix = achPrefix; + if (achPrefix) + { + m_asPrefix = achPrefix; + return AXIS_SUCCESS; + } + return AXIS_FAIL; } -void Namespace::setURI(const AxisChar* achURI) +int Namespace::setURI(const AxisChar* achURI) { - m_asURI = achURI; + if (achURI) + { + m_asURI = achURI; + return AXIS_SUCCESS; + } + return AXIS_FAIL; } const AxisChar* Namespace::getURI() 1.2 +2 -2 ws-axis/c/src/soap/Namespace.h Index: Namespace.h =================================================================== RCS file: /home/cvs/ws-axis/c/src/soap/Namespace.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Namespace.h 12 Jan 2005 13:50:30 -0000 1.1 +++ Namespace.h 21 Feb 2005 13:46:54 -0000 1.2 @@ -46,8 +46,8 @@ int serialize(SoapSerializer& pSZ, list& lstTmpNameSpaceStack); const AxisChar* getPrefix(); const AxisChar* getURI(); - void setURI(const AxisChar* achURI); - void setPrefix(const AxisChar* achPrefix); + int setURI(const AxisChar* achURI); + int setPrefix(const AxisChar* achPrefix); Namespace(const AxisChar* achPrefix, const AxisChar* achURI); Namespace(); virtual ~Namespace();