2010-01-17 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Rewritten toTagString
	* src/NameMatchOptionHandler.cc
	* test/OptionHandlerTest.cc

ChangeLog

@@ -1,3 +1,9 @@
+2010-01-17  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Rewritten toTagString
+	* src/NameMatchOptionHandler.cc
+	* test/OptionHandlerTest.cc
+
 2010-01-17  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Added dir and files key to the response struct of aria2.tellStatus

src/NameMatchOptionHandler.h

@@ -46,6 +46,7 @@
 #include "A2STR.h"
 #include "util.h"
 #include "OptionHandlerException.h"
+#include "a2functional.h"
 
 #define NO_DESCRIPTION A2STR::NIL
 #define NO_DEFAULT_VALUE A2STR::NIL
@@ -115,10 +116,7 @@ public:
 
   virtual std::string toTagString() const
   {
-    std::stringstream s;
-    std::copy(_tags.begin(), _tags.end(),
-              std::ostream_iterator<std::string>(s, ","));
-    return util::trim(s.str(), ", ");
+    return strjoin(_tags.begin(), _tags.end(), ", ");
   }
 
   virtual const std::string& getName() const

test/OptionHandlerTest.cc

@@ -233,7 +233,7 @@ void OptionHandlerTest::testDefaultOptionHandler()
   handler.addTag("apple");
   CPPUNIT_ASSERT_EQUAL(std::string("apple"), handler.toTagString());
   handler.addTag("orange");
-  CPPUNIT_ASSERT_EQUAL(std::string("apple,orange"), handler.toTagString());
+  CPPUNIT_ASSERT_EQUAL(std::string("apple, orange"), handler.toTagString());
   CPPUNIT_ASSERT(handler.hasTag("apple"));
   CPPUNIT_ASSERT(handler.hasTag("orange"));
   CPPUNIT_ASSERT(!handler.hasTag("pineapple"));