diff options
Diffstat (limited to 'cpp')
-rw-r--r-- | cpp/include/IceXML/Output.h | 137 | ||||
-rw-r--r-- | cpp/include/IceXML/StreamI.h | 234 | ||||
-rw-r--r-- | cpp/src/IceXML/.depend | 2 | ||||
-rw-r--r-- | cpp/src/IceXML/Makefile | 4 | ||||
-rw-r--r-- | cpp/src/IceXML/Output.cpp (renamed from cpp/src/IceXML/XMLOutput.cpp) | 2 | ||||
-rw-r--r-- | cpp/src/IceXML/StreamI.cpp (renamed from cpp/src/IceXML/XMLStream.cpp) | 158 |
6 files changed, 455 insertions, 82 deletions
diff --git a/cpp/include/IceXML/Output.h b/cpp/include/IceXML/Output.h new file mode 100644 index 00000000000..f373cea84d6 --- /dev/null +++ b/cpp/include/IceXML/Output.h @@ -0,0 +1,137 @@ +// ********************************************************************** +// +// Copyright (c) 2001 +// MutableRealms, Inc. +// Huntsville, AL, USA +// +// All Rights Reserved +// +// ********************************************************************** + +#ifndef ICE_XML_OUTPUT_H +#define ICE_XML_OUTPUT_H + +#include <IceUtil/Config.h> +#include <fstream> +#include <stack> + +#ifdef WIN32 +# ifdef ICE_XML_API_EXPORTS +# define ICE_XML_API __declspec(dllexport) +# else +# define ICE_XML_API __declspec(dllimport) +# endif +#else +# define ICE_XML_API /**/ +#endif + +namespace IceXML +{ + +class ICE_XML_API NextLine { }; +class ICE_XML_API StartBlock { }; +class ICE_XML_API EndBlock { }; +class ICE_XML_API Separator { }; + +extern ICE_XML_API NextLine nl; +extern ICE_XML_API StartBlock sb; +extern ICE_XML_API EndBlock eb; +extern ICE_XML_API Separator sp; + +// ---------------------------------------------------------------------- +// Indent +// ---------------------------------------------------------------------- + +class ICE_XML_API Output : public ::IceUtil::noncopyable +{ +public: + + Output(); + Output(std::ostream&); + Output(const char*); + + void setBeginBlock(const char *); // what do we use at block starts? + void setEndBlock(const char *); // what do we use the block end? + void setIndent(int); // what is the indent level? + void setUseTab(bool); // should we output tabs? + + void open(const char*); // Open output stream + + void print(const char*); // Print a string + + void inc(); // Increment indentation level + void dec(); // Decrement indentation level + + void useCurrentPosAsIndent(); // Save the current position as indentation + void zeroIndent(); // Use zero identation + void restoreIndent(); // Restore indentation + + void nl(); // Print newline + void sb(); // Start a block + void eb(); // End a block + void sp(); // Print separator + + bool operator!() const; // Check whether the output state is ok + +private: + + std::ofstream _fout; + std::ostream& _out; + int _pos; + int _indent; + std::stack<int> _indentSave; + bool _separator; + + std::string _blockStart; + std::string _blockEnd; + bool _useTab; + int _indentSize; +}; + +template<typename T> +Output& +operator<<(Output& out, const T& val) +{ + std::ostringstream s; + s << val; + out.print(s.str().c_str()); + return out; +} + +template<> +inline Output& +operator<<(Output& o, const NextLine&) +{ + o.nl(); + return o; +} + +template<> +inline Output& +operator<<(Output& o, const StartBlock&) +{ + o.sb(); + return o; +} + +template<> +inline Output& +operator<<(Output& o, const EndBlock&) +{ + o.eb(); + return o; +} + +template<> +inline Output& +operator<<(Output& o, const Separator&) +{ + o.sp(); + return o; +} + +ICE_XML_API Output& operator<<(Output&, std::ios_base& (*)(std::ios_base&)); + +} + +#endif diff --git a/cpp/include/IceXML/StreamI.h b/cpp/include/IceXML/StreamI.h new file mode 100644 index 00000000000..aff7adf872b --- /dev/null +++ b/cpp/include/IceXML/StreamI.h @@ -0,0 +1,234 @@ +// ********************************************************************** +// +// Copyright (c) 2001 +// MutableRealms, Inc. +// Huntsville, AL, USA +// +// All Rights Reserved +// +// ********************************************************************** + +#ifndef ICE_XML_STREAM_I_H +#define ICE_XML_STREAM_I_H + +#include <Ice/Stream.h> +#include <Ice/CommunicatorF.h> +#include <IceXML/Output.h> + +#include <list> +#include <map> + +#ifdef WIN32 +# ifdef ICE_XML_API_EXPORTS +# define ICE_XML_API __declspec(dllexport) +# else +# define ICE_XML_API __declspec(dllimport) +# endif +#else +# define ICE_XML_API /**/ +#endif + +namespace IceXML +{ + +// +// This is to reduce dependencies on Xerces. +// +struct StreamInputImpl; + +class ICE_XML_API StreamI : public Ice::Stream +{ + StreamI(); + StreamI(const Stream&); + void operator=(const StreamI&); + +public: + + StreamI(const ::Ice::CommunicatorPtr&, std::ostream&); + + StreamI(const ::Ice::CommunicatorPtr&, std::istream&); + + ~StreamI(); + + virtual void startWriteDictionary(const ::std::string&, ::Ice::Int); + + virtual void endWriteDictionary(); + + virtual void startWriteDictionaryElement(); + + virtual void endWriteDictionaryElement(); + + virtual void startReadDictionary(const ::std::string&, ::Ice::Int&); + + virtual void endReadDictionary(); + + virtual void startReadDictionaryElement(); + + virtual void endReadDictionaryElement(); + + virtual void startWriteSequence(const ::std::string&, ::Ice::Int); + + virtual void endWriteSequence(); + + virtual void startWriteSequenceElement(); + + virtual void endWriteSequenceElement(); + + virtual void startReadSequence(const ::std::string&, ::Ice::Int&); + + virtual void endReadSequence(); + + virtual void startReadSequenceElement(); + + virtual void endReadSequenceElement(); + + virtual void startWriteStruct(const ::std::string&); + + virtual void endWriteStruct(); + + virtual void startReadStruct(const ::std::string&); + + virtual void endReadStruct(); + + virtual void startWriteException(const ::std::string&); + + virtual void endWriteException(); + + virtual void startReadException(const ::std::string&); + + virtual void endReadException(); + + virtual void writeEnum(const ::std::string&, const ::Ice::StringSeq&, ::Ice::Int); + + virtual void readEnum(const ::std::string&, const ::Ice::StringSeq&, ::Ice::Int&); + + virtual void writeByte(const ::std::string&, ::Ice::Byte); + + virtual void writeByteSeq(const ::std::string&, const ::Ice::ByteSeq&); + + virtual void readByte(const ::std::string&, ::Ice::Byte&); + + virtual void readByteSeq(const ::std::string&, ::Ice::ByteSeq&); + + virtual void writeBool(const ::std::string&, bool); + + virtual void writeBoolSeq(const ::std::string&, const ::Ice::BoolSeq&); + + virtual void readBool(const ::std::string&, bool&); + + virtual void readBoolSeq(const ::std::string&, ::Ice::BoolSeq&); + + virtual void writeShort(const ::std::string&, ::Ice::Short); + + virtual void writeShortSeq(const ::std::string&, const ::Ice::ShortSeq&); + + virtual void readShort(const ::std::string&, ::Ice::Short&); + + virtual void readShortSeq(const ::std::string&, ::Ice::ShortSeq&); + + virtual void writeInt(const ::std::string&, ::Ice::Int); + + virtual void writeIntSeq(const ::std::string&, const ::Ice::IntSeq&); + + virtual void readInt(const ::std::string&, ::Ice::Int&); + + virtual void readIntSeq(const ::std::string&, ::Ice::IntSeq&); + + virtual void writeLong(const ::std::string&, ::Ice::Long); + + virtual void writeLongSeq(const ::std::string&, const ::Ice::LongSeq&); + + virtual void readLong(const ::std::string&, ::Ice::Long&); + + virtual void readLongSeq(const ::std::string&, ::Ice::LongSeq&); + + virtual void writeFloat(const ::std::string&, ::Ice::Float); + + virtual void writeFloatSeq(const ::std::string&, const ::Ice::FloatSeq&); + + virtual void readFloat(const ::std::string&, ::Ice::Float&); + + virtual void readFloatSeq(const ::std::string&, ::Ice::FloatSeq&); + + virtual void writeDouble(const ::std::string&, ::Ice::Double); + + virtual void writeDoubleSeq(const ::std::string&, const ::Ice::DoubleSeq&); + + virtual void readDouble(const ::std::string&, ::Ice::Double&); + + virtual void readDoubleSeq(const ::std::string&, ::Ice::DoubleSeq&); + + virtual void writeString(const ::std::string&, const ::std::string&); + + virtual void writeStringSeq(const ::std::string&, const ::Ice::StringSeq&); + + virtual void readString(const ::std::string&, ::std::string&); + + virtual void readStringSeq(const ::std::string&, ::Ice::StringSeq&); + + virtual void writeProxy(const ::std::string&, const ::Ice::ObjectPrx&); + + virtual void readProxy(const ::std::string&, ::Ice::ObjectPrx&); + + virtual void writeObject(const ::std::string&, const ::Ice::ObjectPtr&); + + virtual void readObject(const ::std::string&, const ::std::string&, const ::Ice::ObjectFactoryPtr&, + ::Ice::ObjectPtr&); + +private: + + void startWrite(const std::string&); + void endWrite(); + + void startRead(const std::string&); + void endRead(); + + void dumpUnwrittenObjects(); + void writeObjectData(const ::std::string&, const ::std::string&, const ::Ice::ObjectPtr&); + void readAttributes(::std::string&, ::std::string&, ::std::string&); + ::Ice::Int readLength(); + + ::Ice::CommunicatorPtr _communicator; + + // + // Name of the sequence element name + // + static const ::std::string seqElementName; + + // + // For reading. + // + ::std::string _content; + StreamInputImpl* _input; + + // + // For writing. + // + + // + // XML Output stream. + // + Output _os; + + // + // Stack of started elements. + // + ::std::stack<std::string> _elementStack; + + // + // Next id for marshaling objects. + // + int _nextId; + struct ObjectInfo + { + ObjectInfo(const ::std::string& i, bool w) : + id(i), written(w) { } + ::std::string id; // The id of the associated object + bool written; // Has the object been written? + }; + ::std::map<Ice::ObjectPtr, ObjectInfo> _objects; +}; + +} // End namespace IceXML + +#endif diff --git a/cpp/src/IceXML/.depend b/cpp/src/IceXML/.depend index e69de29bb2d..05f4b8f9277 100644 --- a/cpp/src/IceXML/.depend +++ b/cpp/src/IceXML/.depend @@ -0,0 +1,2 @@ +StreamI.o: StreamI.cpp ../../include/Ice/Object.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/StreamF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/LocalObject.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/LoggerF.h ../../include/Ice/PropertiesF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/Logger.h ../../include/Ice/ObjectFactory.h ../../include/IceXML/StreamI.h ../../include/Ice/Stream.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/CommunicatorF.h ../../include/IceXML/Output.h +Output.o: Output.cpp ../../include/IceXML/Output.h ../../include/IceUtil/Config.h diff --git a/cpp/src/IceXML/Makefile b/cpp/src/IceXML/Makefile index c8067c04607..4657bd3197f 100644 --- a/cpp/src/IceXML/Makefile +++ b/cpp/src/IceXML/Makefile @@ -18,8 +18,8 @@ VERSIONED_NAME = $(top_srcdir)/lib/$(VERSIONED_BASE) TARGETS = $(NAME) $(VERSIONED_NAME) -OBJS = XMLStream.o \ - XMLOutput.o +OBJS = StreamI.o \ + Output.o SRCS = $(OBJS:.o=.cpp) diff --git a/cpp/src/IceXML/XMLOutput.cpp b/cpp/src/IceXML/Output.cpp index 0272fe54082..8646d34fcee 100644 --- a/cpp/src/IceXML/XMLOutput.cpp +++ b/cpp/src/IceXML/Output.cpp @@ -8,7 +8,7 @@ // // ********************************************************************** -#include <IceXML/XMLOutput.h> +#include <IceXML/Output.h> using namespace std; using namespace IceXML; diff --git a/cpp/src/IceXML/XMLStream.cpp b/cpp/src/IceXML/StreamI.cpp index ffdeaf43b7a..82f30514ca7 100644 --- a/cpp/src/IceXML/XMLStream.cpp +++ b/cpp/src/IceXML/StreamI.cpp @@ -14,7 +14,7 @@ #include <Ice/LocalException.h> #include <Ice/ObjectFactory.h> -#include <IceXML/XMLStream.h> +#include <IceXML/StreamI.h> // // For input streaming @@ -132,15 +132,15 @@ namespace IceXML // This is used to reduce the external dependencies on the xerces // headers. // -struct XMLStreamInputImpl +struct StreamInputImpl { - XMLStreamInputImpl() : + StreamInputImpl() : source(0), parser(0), errReporter(0) { } - ~XMLStreamInputImpl() + ~StreamInputImpl() { delete parser; delete errReporter; @@ -162,9 +162,9 @@ struct XMLStreamInputImpl // // A constant string which is used as the name of collection elements. // -const string XMLStream::seqElementName("e"); +const string IceXML::StreamI::seqElementName("e"); -XMLStream::XMLStream(const ::Ice::CommunicatorPtr& communicator, std::ostream& os) : +IceXML::StreamI::StreamI(const ::Ice::CommunicatorPtr& communicator, std::ostream& os) : _communicator(communicator), _input(0), _os(os), @@ -189,7 +189,7 @@ XMLStream::XMLStream(const ::Ice::CommunicatorPtr& communicator, std::ostream& o } -XMLStream::XMLStream(const ::Ice::CommunicatorPtr& communicator, std::istream& is) : +IceXML::StreamI::StreamI(const ::Ice::CommunicatorPtr& communicator, std::istream& is) : _communicator(communicator), _nextId(0) { @@ -221,7 +221,7 @@ XMLStream::XMLStream(const ::Ice::CommunicatorPtr& communicator, std::istream& i _content.append(buf, is.gcount()); } - _input = new XMLStreamInputImpl(); + _input = new StreamInputImpl(); _input->source = new MemBufInputSource((const XMLByte*)_content.data(), _content.size(), "inputsource"); // @@ -287,7 +287,7 @@ XMLStream::XMLStream(const ::Ice::CommunicatorPtr& communicator, std::istream& i _input->current = _input->current.getFirstChild(); } -XMLStream::~XMLStream() +IceXML::StreamI::~StreamI() { delete _input; @@ -299,7 +299,7 @@ XMLStream::~XMLStream() } void -XMLStream::startWriteDictionary(const string& name, ::Ice::Int size) +IceXML::StreamI::startWriteDictionary(const string& name, ::Ice::Int size) { ostringstream os; os << name << " length=\"" << size << "\""; @@ -307,25 +307,25 @@ XMLStream::startWriteDictionary(const string& name, ::Ice::Int size) } void -XMLStream::endWriteDictionary() +IceXML::StreamI::endWriteDictionary() { endWrite(); } void -XMLStream::startWriteDictionaryElement() +IceXML::StreamI::startWriteDictionaryElement() { startWrite(seqElementName); } void -XMLStream::endWriteDictionaryElement() +IceXML::StreamI::endWriteDictionaryElement() { endWrite(); } void -XMLStream::startReadDictionary(const string& name, ::Ice::Int& size) +IceXML::StreamI::startReadDictionary(const string& name, ::Ice::Int& size) { startRead(name); size = readLength(); @@ -333,25 +333,25 @@ XMLStream::startReadDictionary(const string& name, ::Ice::Int& size) } void -XMLStream::endReadDictionary() +IceXML::StreamI::endReadDictionary() { endRead(); } void -XMLStream::startReadDictionaryElement() +IceXML::StreamI::startReadDictionaryElement() { startRead(seqElementName); } void -XMLStream::endReadDictionaryElement() +IceXML::StreamI::endReadDictionaryElement() { endRead(); } void -XMLStream::startWriteSequence(const string& name, ::Ice::Int size) +IceXML::StreamI::startWriteSequence(const string& name, ::Ice::Int size) { ostringstream os; os << name << " length=\"" << size << "\""; @@ -359,25 +359,25 @@ XMLStream::startWriteSequence(const string& name, ::Ice::Int size) } void -XMLStream::endWriteSequence() +IceXML::StreamI::endWriteSequence() { endWrite(); } void -XMLStream::startWriteSequenceElement() +IceXML::StreamI::startWriteSequenceElement() { startWrite(seqElementName); } void -XMLStream::endWriteSequenceElement() +IceXML::StreamI::endWriteSequenceElement() { endWrite(); } void -XMLStream::startReadSequence(const string& name, ::Ice::Int& size) +IceXML::StreamI::startReadSequence(const string& name, ::Ice::Int& size) { startRead(name); size = readLength(); @@ -385,75 +385,75 @@ XMLStream::startReadSequence(const string& name, ::Ice::Int& size) } void -XMLStream::endReadSequence() +IceXML::StreamI::endReadSequence() { endRead(); } void -XMLStream::startReadSequenceElement() +IceXML::StreamI::startReadSequenceElement() { startRead(seqElementName); } void -XMLStream::endReadSequenceElement() +IceXML::StreamI::endReadSequenceElement() { endRead(); } void -XMLStream::startWriteStruct(const string& name) +IceXML::StreamI::startWriteStruct(const string& name) { startWrite(name); } void -XMLStream::endWriteStruct() +IceXML::StreamI::endWriteStruct() { endWrite(); } void -XMLStream::startReadStruct(const string& name) +IceXML::StreamI::startReadStruct(const string& name) { startRead(name); _input->current = _input->current.getFirstChild(); } void -XMLStream::endReadStruct() +IceXML::StreamI::endReadStruct() { endRead(); } void -XMLStream::startWriteException(const string& name) +IceXML::StreamI::startWriteException(const string& name) { startWrite(name); } void -XMLStream::endWriteException() +IceXML::StreamI::endWriteException() { endWrite(); } void -XMLStream::startReadException(const string& name) +IceXML::StreamI::startReadException(const string& name) { startRead(name); _input->current = _input->current.getFirstChild(); } void -XMLStream::endReadException() +IceXML::StreamI::endReadException() { endRead(); } void -XMLStream::writeEnum(const string& name, const ::Ice::StringSeq& table, ::Ice::Int ordinal) +IceXML::StreamI::writeEnum(const string& name, const ::Ice::StringSeq& table, ::Ice::Int ordinal) { // No attributes assert(name.find_first_of(" \t") == string::npos); @@ -461,7 +461,7 @@ XMLStream::writeEnum(const string& name, const ::Ice::StringSeq& table, ::Ice::I } void -XMLStream::readEnum(const string& name, const ::Ice::StringSeq& table, ::Ice::Int& ordinal) +IceXML::StreamI::readEnum(const string& name, const ::Ice::StringSeq& table, ::Ice::Int& ordinal) { startRead(name); @@ -483,7 +483,7 @@ XMLStream::readEnum(const string& name, const ::Ice::StringSeq& table, ::Ice::In } void -XMLStream::writeByte(const string& name, ::Ice::Byte value) +IceXML::StreamI::writeByte(const string& name, ::Ice::Byte value) { // No attributes assert(name.find_first_of(" \t") == string::npos); @@ -493,7 +493,7 @@ XMLStream::writeByte(const string& name, ::Ice::Byte value) } void -XMLStream::writeByteSeq(const string& name, const ::Ice::ByteSeq& seq) +IceXML::StreamI::writeByteSeq(const string& name, const ::Ice::ByteSeq& seq) { startWrite(name); for (::Ice::ByteSeq::const_iterator p = seq.begin(); p != seq.end(); ++p) @@ -504,7 +504,7 @@ XMLStream::writeByteSeq(const string& name, const ::Ice::ByteSeq& seq) } void -XMLStream::readByte(const string& name, ::Ice::Byte& value) +IceXML::StreamI::readByte(const string& name, ::Ice::Byte& value) { startRead(name); @@ -566,7 +566,7 @@ XMLStream::readByte(const string& name, ::Ice::Byte& value) // void -XMLStream::readByteSeq(const string& name, ::Ice::ByteSeq& value) +IceXML::StreamI::readByteSeq(const string& name, ::Ice::ByteSeq& value) { startRead(name); @@ -585,7 +585,7 @@ XMLStream::readByteSeq(const string& name, ::Ice::ByteSeq& value) } void -XMLStream::writeBool(const string& name, bool value) +IceXML::StreamI::writeBool(const string& name, bool value) { // No attributes assert(name.find_first_of(" \t") == string::npos); @@ -593,7 +593,7 @@ XMLStream::writeBool(const string& name, bool value) } void -XMLStream::writeBoolSeq(const string& name, const ::Ice::BoolSeq& seq) +IceXML::StreamI::writeBoolSeq(const string& name, const ::Ice::BoolSeq& seq) { startWrite(name); for (::Ice::BoolSeq::const_iterator p = seq.begin(); p != seq.end(); ++p) @@ -604,7 +604,7 @@ XMLStream::writeBoolSeq(const string& name, const ::Ice::BoolSeq& seq) } void -XMLStream::readBool(const string& name, bool& value) +IceXML::StreamI::readBool(const string& name, bool& value) { startRead(name); @@ -621,7 +621,7 @@ XMLStream::readBool(const string& name, bool& value) } void -XMLStream::readBoolSeq(const string& name, ::Ice::BoolSeq& value) +IceXML::StreamI::readBoolSeq(const string& name, ::Ice::BoolSeq& value) { startRead(name); @@ -642,7 +642,7 @@ XMLStream::readBoolSeq(const string& name, ::Ice::BoolSeq& value) } void -XMLStream::writeShort(const string& name, ::Ice::Short value) +IceXML::StreamI::writeShort(const string& name, ::Ice::Short value) { // No attributes assert(name.find_first_of(" \t") == string::npos); @@ -650,7 +650,7 @@ XMLStream::writeShort(const string& name, ::Ice::Short value) } void -XMLStream::writeShortSeq(const string& name, const ::Ice::ShortSeq& seq) +IceXML::StreamI::writeShortSeq(const string& name, const ::Ice::ShortSeq& seq) { startWrite(name); for (::Ice::ShortSeq::const_iterator p = seq.begin(); p != seq.end(); ++p) @@ -661,7 +661,7 @@ XMLStream::writeShortSeq(const string& name, const ::Ice::ShortSeq& seq) } void -XMLStream::readShort(const string& name, ::Ice::Short& value) +IceXML::StreamI::readShort(const string& name, ::Ice::Short& value) { startRead(name); @@ -678,7 +678,7 @@ XMLStream::readShort(const string& name, ::Ice::Short& value) } void -XMLStream::readShortSeq(const string& name, ::Ice::ShortSeq& value) +IceXML::StreamI::readShortSeq(const string& name, ::Ice::ShortSeq& value) { startRead(name); @@ -697,7 +697,7 @@ XMLStream::readShortSeq(const string& name, ::Ice::ShortSeq& value) } void -XMLStream::writeInt(const string& name, ::Ice::Int value) +IceXML::StreamI::writeInt(const string& name, ::Ice::Int value) { // No attributes assert(name.find_first_of(" \t") == string::npos); @@ -705,7 +705,7 @@ XMLStream::writeInt(const string& name, ::Ice::Int value) } void -XMLStream::writeIntSeq(const string& name, const ::Ice::IntSeq& seq) +IceXML::StreamI::writeIntSeq(const string& name, const ::Ice::IntSeq& seq) { startWrite(name); for (::Ice::IntSeq::const_iterator p = seq.begin(); p != seq.end(); ++p) @@ -716,7 +716,7 @@ XMLStream::writeIntSeq(const string& name, const ::Ice::IntSeq& seq) } void -XMLStream::readInt(const string& name, ::Ice::Int& value) +IceXML::StreamI::readInt(const string& name, ::Ice::Int& value) { startRead(name); @@ -733,7 +733,7 @@ XMLStream::readInt(const string& name, ::Ice::Int& value) } void -XMLStream::readIntSeq(const string& name, ::Ice::IntSeq& value) +IceXML::StreamI::readIntSeq(const string& name, ::Ice::IntSeq& value) { startRead(name); @@ -752,7 +752,7 @@ XMLStream::readIntSeq(const string& name, ::Ice::IntSeq& value) } void -XMLStream::writeLong(const string& name, ::Ice::Long value) +IceXML::StreamI::writeLong(const string& name, ::Ice::Long value) { // No attributes assert(name.find_first_of(" \t") == string::npos); @@ -760,7 +760,7 @@ XMLStream::writeLong(const string& name, ::Ice::Long value) } void -XMLStream::writeLongSeq(const string& name, const ::Ice::LongSeq& seq) +IceXML::StreamI::writeLongSeq(const string& name, const ::Ice::LongSeq& seq) { startWrite(name); for (::Ice::LongSeq::const_iterator p = seq.begin(); p != seq.end(); ++p) @@ -771,7 +771,7 @@ XMLStream::writeLongSeq(const string& name, const ::Ice::LongSeq& seq) } void -XMLStream::readLong(const string& name, ::Ice::Long& value) +IceXML::StreamI::readLong(const string& name, ::Ice::Long& value) { startRead(name); @@ -788,7 +788,7 @@ XMLStream::readLong(const string& name, ::Ice::Long& value) } void -XMLStream::readLongSeq(const string& name, ::Ice::LongSeq& value) +IceXML::StreamI::readLongSeq(const string& name, ::Ice::LongSeq& value) { startRead(name); @@ -807,7 +807,7 @@ XMLStream::readLongSeq(const string& name, ::Ice::LongSeq& value) } void -XMLStream::writeFloat(const string& name, ::Ice::Float value) +IceXML::StreamI::writeFloat(const string& name, ::Ice::Float value) { // No attributes assert(name.find_first_of(" \t") == string::npos); @@ -815,7 +815,7 @@ XMLStream::writeFloat(const string& name, ::Ice::Float value) } void -XMLStream::writeFloatSeq(const string& name, const ::Ice::FloatSeq& seq) +IceXML::StreamI::writeFloatSeq(const string& name, const ::Ice::FloatSeq& seq) { startWrite(name); for (::Ice::FloatSeq::const_iterator p = seq.begin(); p != seq.end(); ++p) @@ -826,7 +826,7 @@ XMLStream::writeFloatSeq(const string& name, const ::Ice::FloatSeq& seq) } void -XMLStream::readFloat(const string& name, ::Ice::Float& value) +IceXML::StreamI::readFloat(const string& name, ::Ice::Float& value) { startRead(name); @@ -843,7 +843,7 @@ XMLStream::readFloat(const string& name, ::Ice::Float& value) } void -XMLStream::readFloatSeq(const string& name, ::Ice::FloatSeq& value) +IceXML::StreamI::readFloatSeq(const string& name, ::Ice::FloatSeq& value) { startRead(name); @@ -862,7 +862,7 @@ XMLStream::readFloatSeq(const string& name, ::Ice::FloatSeq& value) } void -XMLStream::writeDouble(const string& name, ::Ice::Double value) +IceXML::StreamI::writeDouble(const string& name, ::Ice::Double value) { // No attributes assert(name.find_first_of(" \t") == string::npos); @@ -870,7 +870,7 @@ XMLStream::writeDouble(const string& name, ::Ice::Double value) } void -XMLStream::writeDoubleSeq(const string& name, const ::Ice::DoubleSeq& seq) +IceXML::StreamI::writeDoubleSeq(const string& name, const ::Ice::DoubleSeq& seq) { startWrite(name); for (::Ice::DoubleSeq::const_iterator p = seq.begin(); p != seq.end(); ++p) @@ -881,7 +881,7 @@ XMLStream::writeDoubleSeq(const string& name, const ::Ice::DoubleSeq& seq) } void -XMLStream::readDouble(const string& name, ::Ice::Double& value) +IceXML::StreamI::readDouble(const string& name, ::Ice::Double& value) { startRead(name); @@ -898,7 +898,7 @@ XMLStream::readDouble(const string& name, ::Ice::Double& value) } void -XMLStream::readDoubleSeq(const string& name, ::Ice::DoubleSeq& value) +IceXML::StreamI::readDoubleSeq(const string& name, ::Ice::DoubleSeq& value) { startRead(name); @@ -917,7 +917,7 @@ XMLStream::readDoubleSeq(const string& name, ::Ice::DoubleSeq& value) } void -XMLStream::writeString(const string& name, const string& value) +IceXML::StreamI::writeString(const string& name, const string& value) { // No attributes assert(name.find_first_of(" \t") == string::npos); @@ -925,7 +925,7 @@ XMLStream::writeString(const string& name, const string& value) } void -XMLStream::writeStringSeq(const string& name, const ::Ice::StringSeq& seq) +IceXML::StreamI::writeStringSeq(const string& name, const ::Ice::StringSeq& seq) { startWrite(name); for (::Ice::StringSeq::const_iterator p = seq.begin(); p != seq.end(); ++p) @@ -936,7 +936,7 @@ XMLStream::writeStringSeq(const string& name, const ::Ice::StringSeq& seq) } void -XMLStream::readString(const string& name, string& value) +IceXML::StreamI::readString(const string& name, string& value) { startRead(name); @@ -959,7 +959,7 @@ XMLStream::readString(const string& name, string& value) } void -XMLStream::readStringSeq(const string& name, ::Ice::StringSeq& value) +IceXML::StreamI::readStringSeq(const string& name, ::Ice::StringSeq& value) { startRead(name); @@ -978,7 +978,7 @@ XMLStream::readStringSeq(const string& name, ::Ice::StringSeq& value) } void -XMLStream::writeProxy(const string& name, const ::Ice::ObjectPrx& proxy) +IceXML::StreamI::writeProxy(const string& name, const ::Ice::ObjectPrx& proxy) { // No attributes assert(name.find_first_of(" \t") == string::npos); @@ -987,7 +987,7 @@ XMLStream::writeProxy(const string& name, const ::Ice::ObjectPrx& proxy) } void -XMLStream::readProxy(const string& name, ::Ice::ObjectPrx& value) +IceXML::StreamI::readProxy(const string& name, ::Ice::ObjectPrx& value) { startRead(name); @@ -1008,7 +1008,7 @@ XMLStream::readProxy(const string& name, ::Ice::ObjectPrx& value) } void -XMLStream::writeObject(const string& name, const ::Ice::ObjectPtr& obj) +IceXML::StreamI::writeObject(const string& name, const ::Ice::ObjectPtr& obj) { // // If at the top level of the document then the object itself must @@ -1044,7 +1044,7 @@ XMLStream::writeObject(const string& name, const ::Ice::ObjectPtr& obj) } void -XMLStream::readObject(const string& name, const string& signatureType, const ::Ice::ObjectFactoryPtr& factory, +IceXML::StreamI::readObject(const string& name, const string& signatureType, const ::Ice::ObjectFactoryPtr& factory, ::Ice::ObjectPtr& value) { startRead(name); @@ -1157,7 +1157,7 @@ XMLStream::readObject(const string& name, const string& signatureType, const ::I } void -XMLStream::startWrite(const string& element) +IceXML::StreamI::startWrite(const string& element) { _os << nl << '<' << element << '>'; _os.inc(); @@ -1174,7 +1174,7 @@ XMLStream::startWrite(const string& element) } void -XMLStream::endWrite() +IceXML::StreamI::endWrite() { string element = _elementStack.top(); _elementStack.pop(); @@ -1190,7 +1190,7 @@ XMLStream::endWrite() void -XMLStream::startRead(const ::std::string& element) +IceXML::StreamI::startRead(const ::std::string& element) { while (!_input->current.isNull() && _input->current.getNodeType() != DOM_Node::ELEMENT_NODE) { @@ -1212,7 +1212,7 @@ XMLStream::startRead(const ::std::string& element) } void -XMLStream::endRead() +IceXML::StreamI::endRead() { _input->current = _input->nodeStack.back(); _input->nodeStack.pop_back(); @@ -1220,7 +1220,7 @@ XMLStream::endRead() } void -XMLStream::dumpUnwrittenObjects() +IceXML::StreamI::dumpUnwrittenObjects() { // // Precondition: Must be at the top-level. @@ -1256,7 +1256,7 @@ XMLStream::dumpUnwrittenObjects() } void -XMLStream::writeObjectData(const string& name, const string& id, const Ice::ObjectPtr& obj) +IceXML::StreamI::writeObjectData(const string& name, const string& id, const Ice::ObjectPtr& obj) { string xsdType; string typeId; @@ -1314,7 +1314,7 @@ XMLStream::writeObjectData(const string& name, const string& id, const Ice::Obje } void -XMLStream::readAttributes(::std::string& id, ::std::string& type, ::std::string& href) +IceXML::StreamI::readAttributes(::std::string& id, ::std::string& type, ::std::string& href) { static const string idStr("id"); static const string typeStr("type"); @@ -1342,7 +1342,7 @@ XMLStream::readAttributes(::std::string& id, ::std::string& type, ::std::string& } ::Ice::Int -XMLStream::readLength() +IceXML::StreamI::readLength() { static const string lengthStr("length"); |