Kaydet (Commit) 6292bba6 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Rename SourceProvider -> SourceTreeProvider

Change-Id: Ic864f9c6f3dbbe9f75bdae76818c00f62825182d
üst d11592ad
...@@ -13,7 +13,7 @@ $(eval $(call gb_Library_add_defs,unoidl,-DLO_DLLIMPLEMENTATION_UNOIDL)) ...@@ -13,7 +13,7 @@ $(eval $(call gb_Library_add_defs,unoidl,-DLO_DLLIMPLEMENTATION_UNOIDL))
$(eval $(call gb_Library_add_exception_objects,unoidl, \ $(eval $(call gb_Library_add_exception_objects,unoidl, \
unoidl/source/legacyprovider \ unoidl/source/legacyprovider \
unoidl/source/sourceprovider \ unoidl/source/sourcetreeprovider \
unoidl/source/unoidl \ unoidl/source/unoidl \
unoidl/source/unoidlprovider \ unoidl/source/unoidlprovider \
)) ))
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include "sourceprovider-parser-requires.hxx" #include "sourceprovider-parser-requires.hxx"
#include "sourceprovider-parser.hxx" #include "sourceprovider-parser.hxx"
#include "sourceprovider-scanner.hxx" #include "sourceprovider-scanner.hxx"
#include "sourceprovider.hxx" #include "sourcetreeprovider.hxx"
namespace unoidl { namespace detail { namespace unoidl { namespace detail {
...@@ -56,16 +56,18 @@ private: ...@@ -56,16 +56,18 @@ private:
} }
SourceProvider::SourceProvider( SourceTreeProvider::SourceTreeProvider(
rtl::Reference<Manager> const & manager, OUString const & uri): rtl::Reference<Manager> const & manager, OUString const & uri):
manager_(manager), uri_(uri.endsWith("/") ? uri : uri + "/") manager_(manager), uri_(uri.endsWith("/") ? uri : uri + "/")
{} {}
rtl::Reference<MapCursor> SourceProvider::createRootCursor() const { rtl::Reference<MapCursor> SourceTreeProvider::createRootCursor() const {
return new Cursor; return new Cursor;
} }
rtl::Reference<Entity> SourceProvider::findEntity(OUString const & name) const { rtl::Reference<Entity> SourceTreeProvider::findEntity(OUString const & name)
const
{
std::map< OUString, rtl::Reference<Entity> >::iterator ci( std::map< OUString, rtl::Reference<Entity> >::iterator ci(
cache_.find(name)); cache_.find(name));
if (ci != cache_.end()) { if (ci != cache_.end()) {
...@@ -143,7 +145,7 @@ rtl::Reference<Entity> SourceProvider::findEntity(OUString const & name) const { ...@@ -143,7 +145,7 @@ rtl::Reference<Entity> SourceProvider::findEntity(OUString const & name) const {
return ent; return ent;
} }
SourceProvider::~SourceProvider() throw () {} SourceTreeProvider::~SourceTreeProvider() throw () {}
} } } }
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/ */
#ifndef INCLUDED_UNOIDL_SOURCEPROVIDER_HXX #ifndef INCLUDED_UNOIDL_SOURCETREEPROVIDER_HXX
#define INCLUDED_UNOIDL_SOURCEPROVIDER_HXX #define INCLUDED_UNOIDL_SOURCETREEPROVIDER_HXX
#include "sal/config.h" #include "sal/config.h"
...@@ -19,10 +19,10 @@ ...@@ -19,10 +19,10 @@
namespace unoidl { namespace detail { namespace unoidl { namespace detail {
class SourceProvider: public Provider { class SourceTreeProvider: public Provider {
public: public:
// throws FileFormatException, NoSuchFileException: // throws FileFormatException, NoSuchFileException:
SourceProvider( SourceTreeProvider(
rtl::Reference<Manager> const & manager, OUString const & uri); rtl::Reference<Manager> const & manager, OUString const & uri);
// throws FileFormatException: // throws FileFormatException:
...@@ -32,7 +32,7 @@ public: ...@@ -32,7 +32,7 @@ public:
virtual rtl::Reference<Entity> findEntity(OUString const & name) const; virtual rtl::Reference<Entity> findEntity(OUString const & name) const;
private: private:
virtual ~SourceProvider() throw (); virtual ~SourceTreeProvider() throw ();
rtl::Reference<Manager> manager_; rtl::Reference<Manager> manager_;
OUString uri_; OUString uri_;
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "unoidl/unoidl.hxx" #include "unoidl/unoidl.hxx"
#include "legacyprovider.hxx" #include "legacyprovider.hxx"
#include "sourceprovider.hxx" #include "sourcetreeprovider.hxx"
#include "unoidlprovider.hxx" #include "unoidlprovider.hxx"
namespace unoidl { namespace unoidl {
...@@ -114,7 +114,7 @@ rtl::Reference< Provider > loadProvider( ...@@ -114,7 +114,7 @@ rtl::Reference< Provider > loadProvider(
if (item.getFileStatus(status) == osl::FileBase::E_None if (item.getFileStatus(status) == osl::FileBase::E_None
&& status.getFileType() == osl::FileStatus::Directory) && status.getFileType() == osl::FileStatus::Directory)
{ {
return new detail::SourceProvider(manager, uri); return new detail::SourceTreeProvider(manager, uri);
} }
} }
try { try {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment