diff options
| author | Mark Spruiell <mes@zeroc.com> | 2016-09-14 17:03:58 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2016-09-14 17:03:58 -0700 |
| commit | e9f4f1ee06d2fd06ddf6c9067b107e9eefc4f8c8 (patch) | |
| tree | 642e8cf7068c80b0eb5195d88269789d8a40a6e1 /cpp/src/slice2java/Gen.h | |
| parent | ICE-7346: fixed linking with libcrypto on Linux (diff) | |
| download | ice-e9f4f1ee06d2fd06ddf6c9067b107e9eefc4f8c8.tar.bz2 ice-e9f4f1ee06d2fd06ddf6c9067b107e9eefc4f8c8.tar.xz ice-e9f4f1ee06d2fd06ddf6c9067b107e9eefc4f8c8.zip | |
cleaning up javadocs in Java 8 core, generated code
Diffstat (limited to 'cpp/src/slice2java/Gen.h')
| -rw-r--r-- | cpp/src/slice2java/Gen.h | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/cpp/src/slice2java/Gen.h b/cpp/src/slice2java/Gen.h index 8aa2c46280d..102a71633f9 100644 --- a/cpp/src/slice2java/Gen.h +++ b/cpp/src/slice2java/Gen.h @@ -29,9 +29,22 @@ protected: enum ParamDir { InParam, OutParam }; + struct DocComment : public IceUtil::SimpleShared + { + std::string overview; + std::map<std::string, std::string> params; + std::map<std::string, std::string> exceptions; + std::string returns; + bool deprecated; + std::string deprecateReason; + std::string misc; + }; + typedef IceUtil::Handle<DocComment> DocCommentPtr; + std::string getResultType(const OperationPtr&, const std::string&, bool, bool); - void writeResultType(::IceUtilInternal::Output&, const OperationPtr&, const std::string&); - void writeMarshaledResultType(::IceUtilInternal::Output&, const OperationPtr&, const std::string&); + void writeResultType(::IceUtilInternal::Output&, const OperationPtr&, const std::string&, const DocCommentPtr&); + void writeMarshaledResultType(::IceUtilInternal::Output&, const OperationPtr&, const std::string&, + const DocCommentPtr&); void allocatePatcher(::IceUtilInternal::Output&, const TypePtr&, const std::string&, const std::string&); std::string getPatcher(const TypePtr&, const std::string&, const std::string&, bool); @@ -95,18 +108,17 @@ protected: void writeDataMemberInitializers(::IceUtilInternal::Output&, const DataMemberList&, const std::string&); // - // Write doc comments. + // Handle doc comments. // static StringList splitComment(const ContainedPtr&); - void writeDocComment(::IceUtilInternal::Output&, const ContainedPtr&, const std::string&, const std::string& = ""); - void writeDocComment(::IceUtilInternal::Output&, const std::string&, const std::string&); - void writeDocCommentOp(::IceUtilInternal::Output&, const OperationPtr&); - - void writeDocCommentAsync(::IceUtilInternal::Output&, const OperationPtr&, ParamDir, const std::string& = ""); - void writeDocCommentAMI(::IceUtilInternal::Output&, const OperationPtr&, ParamDir, const std::string& = "", - const std::string& = "", const std::string& = "", const std::string& = "", - const std::string& = ""); - void writeDocCommentParam(::IceUtilInternal::Output&, const OperationPtr&, ParamDir, bool = true); + DocCommentPtr parseDocComment(const ContainedPtr&); + void writeDocCommentLines(::IceUtilInternal::Output&, const std::string&); + void writeDocComment(::IceUtilInternal::Output&, const DocCommentPtr&); + void writeDocComment(::IceUtilInternal::Output&, const std::string&); + void writeProxyDocComment(::IceUtilInternal::Output&, const OperationPtr&, const std::string&, const DocCommentPtr&, + bool, bool); + void writeServantDocComment(::IceUtilInternal::Output&, const OperationPtr&, const std::string&, + const DocCommentPtr&, bool); }; class Gen : private ::IceUtil::noncopyable |