diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-10-20 18:01:05 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-10-20 18:07:27 +0200 |
commit | af748c7fff9e57a5b95bdc569456cc0da93a1f90 (patch) | |
tree | 29701bade2eb083f0bd48e5f7605e164d28088d6 /jvmfwk | |
parent | 5dcfbe57c8c35814d0e8e20c7069be340151da8f (diff) |
Clean up VendorBase (virtual) member functions further
Change-Id: If6b9355c6992eb6651f71c0944a93af0856ef1c7
Diffstat (limited to 'jvmfwk')
-rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx | 5 | ||||
-rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx | 2 | ||||
-rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx | 10 | ||||
-rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx | 33 |
4 files changed, 23 insertions, 27 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx index 4f5a877b8852..9fc69d65570e 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx @@ -84,6 +84,11 @@ char const* const* GnuInfo::getRuntimePaths(int * size) return ar; } +char const* const* GnuInfo::getLibraryPaths(int* /*size*/) +{ + return NULL; +} + bool GnuInfo::initialize(vector<pair<OUString, OUString> > props) { //get java.vendor, java.version, java.home, diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx index 4c364a66c518..f4683d5aace9 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx @@ -37,6 +37,8 @@ public: virtual char const* const* getRuntimePaths(int * size) SAL_OVERRIDE; + virtual char const* const* getLibraryPaths(int* size) SAL_OVERRIDE; + virtual bool initialize( std::vector<std::pair<OUString, OUString> > props) SAL_OVERRIDE; virtual int compareVersions(const OUString& sSecond) const SAL_OVERRIDE; diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx index 563c850b9f77..f91f75ec9aba 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx @@ -179,16 +179,6 @@ bool VendorBase::initialize(vector<pair<OUString, OUString> > props) return true; } -char const* const* VendorBase::getRuntimePaths(int* /*size*/) -{ - return NULL; -} - -char const* const* VendorBase::getLibraryPaths(int* /*size*/) -{ - return NULL; -} - const OUString & VendorBase::getVendor() const { return m_sVendor; diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx index 721017377964..2ecd01ff710e 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx @@ -117,23 +117,6 @@ public: Key - value pairs of the system properties of the JRE. */ - /* called automatically on the instance created by createInstance. - - @return - true - the object could completely initialize. - false - the object could not completely initialize. In this case - it will be discarded by the caller. - */ - virtual bool initialize( - std::vector<std::pair<OUString, OUString> > props); - - /* returns relative file URLs to the runtime library. - For example "/bin/client/jvm.dll" - */ - virtual char const* const* getRuntimePaths(int* size); - - virtual char const* const* getLibraryPaths(int* size); - const OUString & getVendor() const; const OUString & getVersion() const; const OUString & getHome() const; @@ -163,6 +146,22 @@ public: virtual int compareVersions(const OUString& sSecond) const = 0; protected: + /* called automatically on the instance created by createInstance. + + @return + true - the object could completely initialize. + false - the object could not completely initialize. In this case + it will be discarded by the caller. + */ + virtual bool initialize( + std::vector<std::pair<OUString, OUString> > props); + + /* returns relative file URLs to the runtime library. + For example "/bin/client/jvm.dll" + */ + virtual char const* const* getRuntimePaths(int* size) = 0; + + virtual char const* const* getLibraryPaths(int* size) = 0; OUString m_sVendor; OUString m_sVersion; |