From 81b19074f8bbbd997b91e94482f210cbe2fa41ba Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Sun, 10 May 2009 14:51:20 +0000
Subject: [PATCH] 2009-05-10  Tatsuhiro Tsujikawa 
 <t-tujikawa@users.sourceforge.net>

	Renamed addURI as addUri
	* src/XmlRpcMethodFactory.cc
	* src/XmlRpcMethodImpl.cc
	* src/XmlRpcMethodImpl.h
	* test/XmlRpcMethodTest.cc
---
 ChangeLog                  |  8 ++++++++
 src/XmlRpcMethodFactory.cc |  4 ++--
 src/XmlRpcMethodImpl.cc    |  2 +-
 src/XmlRpcMethodImpl.h     |  2 +-
 test/XmlRpcMethodTest.cc   | 10 +++++-----
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 87e7ac2d..e7bfe10c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-05-10  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Renamed addURI as addUri
+	* src/XmlRpcMethodFactory.cc
+	* src/XmlRpcMethodImpl.cc
+	* src/XmlRpcMethodImpl.h	
+	* test/XmlRpcMethodTest.cc
+
 2009-05-10  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Renamed addTorrentFile as addTorrent
diff --git a/src/XmlRpcMethodFactory.cc b/src/XmlRpcMethodFactory.cc
index b030456a..9995734b 100644
--- a/src/XmlRpcMethodFactory.cc
+++ b/src/XmlRpcMethodFactory.cc
@@ -44,8 +44,8 @@ namespace xmlrpc {
 SharedHandle<XmlRpcMethod>
 XmlRpcMethodFactory::create(const std::string& methodName)
 {
-  if(methodName == "aria2.addURI") {
-    return SharedHandle<XmlRpcMethod>(new AddURIXmlRpcMethod());
+  if(methodName == "aria2.addUri") {
+    return SharedHandle<XmlRpcMethod>(new AddUriXmlRpcMethod());
   } else if(methodName == "aria2.addTorrent") {
     return SharedHandle<XmlRpcMethod>(new AddTorrentXmlRpcMethod());
   } else if(methodName == "aria2.remove") {
diff --git a/src/XmlRpcMethodImpl.cc b/src/XmlRpcMethodImpl.cc
index bce60c3a..0cfb76b2 100644
--- a/src/XmlRpcMethodImpl.cc
+++ b/src/XmlRpcMethodImpl.cc
@@ -72,7 +72,7 @@ static BDE createGIDResponse(int32_t gid)
   return resParams;
 }
 
-BDE AddURIXmlRpcMethod::process(const XmlRpcRequest& req, DownloadEngine* e)
+BDE AddUriXmlRpcMethod::process(const XmlRpcRequest& req, DownloadEngine* e)
 {
   const BDE& params = req._params;
   assert(params.isList());
diff --git a/src/XmlRpcMethodImpl.h b/src/XmlRpcMethodImpl.h
index f1d9af49..ca7fa54e 100644
--- a/src/XmlRpcMethodImpl.h
+++ b/src/XmlRpcMethodImpl.h
@@ -41,7 +41,7 @@ namespace aria2 {
 
 namespace xmlrpc {
 
-class AddURIXmlRpcMethod:public XmlRpcMethod {
+class AddUriXmlRpcMethod:public XmlRpcMethod {
 protected:
   virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e);
 };
diff --git a/test/XmlRpcMethodTest.cc b/test/XmlRpcMethodTest.cc
index e807619f..5a29ae37 100644
--- a/test/XmlRpcMethodTest.cc
+++ b/test/XmlRpcMethodTest.cc
@@ -21,7 +21,7 @@ namespace xmlrpc {
 class XmlRpcMethodTest:public CppUnit::TestFixture {
 
   CPPUNIT_TEST_SUITE(XmlRpcMethodTest);
-  CPPUNIT_TEST(testAddURI);
+  CPPUNIT_TEST(testAddUri);
   CPPUNIT_TEST(testNoSuchMethod);
   CPPUNIT_TEST_SUITE_END();
 private:
@@ -40,17 +40,17 @@ public:
 
   void tearDown() {}
 
-  void testAddURI();
+  void testAddUri();
   void testNoSuchMethod();
 };
 
 
 CPPUNIT_TEST_SUITE_REGISTRATION(XmlRpcMethodTest);
 
-void XmlRpcMethodTest::testAddURI()
+void XmlRpcMethodTest::testAddUri()
 {
-  AddURIXmlRpcMethod m;
-  XmlRpcRequest req("aria2.addURI", BDE::list());
+  AddUriXmlRpcMethod m;
+  XmlRpcRequest req("aria2.addUri", BDE::list());
   req._params << BDE::list();
   req._params[0] << BDE("http://localhost/");
   std::string res = m.execute(req, _e.get());