diff options
Diffstat (limited to 'cpp/include/Slice/JavaUtil.h')
| -rw-r--r-- | cpp/include/Slice/JavaUtil.h | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/cpp/include/Slice/JavaUtil.h b/cpp/include/Slice/JavaUtil.h index 78cb938ff93..6c247918ac0 100644 --- a/cpp/include/Slice/JavaUtil.h +++ b/cpp/include/Slice/JavaUtil.h @@ -29,7 +29,7 @@ public: protected: - JavaGenerator(const std::string&, const std::string&); + JavaGenerator(const std::string&); // // Given the fully-scoped Java class name, create any intermediate @@ -47,10 +47,23 @@ protected: std::string fixKwd(const std::string&) const; // - // Convert a scoped name into a Java class name. If an optional - // scope is provided, the scope will be removed from the result. + // Convert a Slice scoped name into a Java name. // - std::string getAbsolute(const std::string&, + std::string convertScopedName(const std::string&, + const std::string& = std::string(), + const std::string& = std::string()) const; + + // + // Returns the Java package of a Contained entity. + // + std::string getPackage(const ContainedPtr&) const; + + // + // Returns the Java name for a Contained entity. If the optional + // package argument matches the entity's package name, then the + // package is removed from the result. + // + std::string getAbsolute(const ContainedPtr&, const std::string& = std::string(), const std::string& = std::string(), const std::string& = std::string()) const; @@ -66,15 +79,14 @@ protected: TypeModeMember, TypeModeReturn }; - std::string typeToString(const TypePtr&, TypeMode mode, - const std::string& = std::string(), - const std::list<std::string>& = std::list<std::string>()) const; + std::string typeToString(const TypePtr&, TypeMode, const std::string& = std::string(), + const StringList& = StringList()) const; // // Generate code to marshal or unmarshal a type // void writeMarshalUnmarshalCode(::IceUtil::Output&, const std::string&, const TypePtr&, const std::string&, - bool, int&, bool = false, const std::list<std::string>& = std::list<std::string>(), + bool, int&, bool = false, const StringList& = StringList(), const std::string& patchParams = ""); // @@ -82,18 +94,17 @@ protected: // void writeSequenceMarshalUnmarshalCode(::IceUtil::Output&, const std::string&, const SequencePtr&, const std::string&, bool, int&, bool, - const std::list<std::string>& = std::list<std::string>()); + const StringList& = StringList()); protected: - static std::string findMetaData(const std::list<std::string>&); + static std::string findMetaData(const StringList&); private: void printHeader(); std::string _dir; - std::string _package; ::IceUtil::Output* _out; }; |