X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FSTLSupport.ct;h=e0f9a48421300ea36454c1c852d8807a57d711fb;hb=d506c3134c5c01272c01608c86b8285176b50226;hp=569211e701692c65ce2b2a0b4a847b6a4ff23a96;hpb=411b898d78f6b51341b95448c9b73c0f8ad074aa;p=senf.git

diff --git a/senf/Utils/Console/STLSupport.ct b/senf/Utils/Console/STLSupport.ct
index 569211e..e0f9a48 100644
--- a/senf/Utils/Console/STLSupport.ct
+++ b/senf/Utils/Console/STLSupport.ct
@@ -1,24 +1,29 @@
 // $Id$
 //
-// Copyright (C) 2009 
+// Copyright (C) 2009
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Stefan Bund <g0dil@berlios.de>
 //
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Stefan Bund <g0dil@berlios.de>
 
 /** \file
     \brief VectorSupport non-inline template implementation  */
@@ -29,23 +34,18 @@
 #include <boost/format.hpp>
 
 #define prefix_
-///////////////////////////////ct.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 #ifndef DOXYGEN
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::detail::CollectionArgumentTraitsBase<Collection>
 
 template <class Collection>
 prefix_ std::string
 senf::console::detail::CollectionArgumentTraitsBase<Collection>::description()
 {
-    std::string type (prettyName(typeid(Collection)));
-    std::string::size_type e (type.find('<'));
-    if (e == std::string::npos) e = type.size();
-    std::string::size_type b (type.rfind(':', e));
-    if (b == std::string::npos) b = 0; else ++b;
-    return type.substr(b,e-b) + "<" 
+    return senf::prettyBaseName(typeid(Collection)) + "<"
         + ArgumentTraits<typename Collection::value_type>::description() + ">";
 }
 
@@ -58,7 +58,7 @@ senf::console::detail::CollectionArgumentTraitsBase<Collection>::str(Collection
     return ss.str();
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::detail::CollectionArgumentTraits<Collection,Adder>
 
 template <class Collection, class Adder>
@@ -74,7 +74,7 @@ parse(ParseCommandInfo::TokensRange const & tokens, Collection & out)
     }
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::detail::CollectionReturnValueTraits<Collection>
 
 template <class Collection>
@@ -87,8 +87,8 @@ senf::console::detail::CollectionReturnValueTraits<Collection>::format(Collectio
     typename type::const_iterator const i_end (value.end());
     if (i != i_end)
         for (;;) {
-            senf::console::format(*i, os);
-            if (++i == i_end) 
+            os << senf::console::str(*i);
+            if (++i == i_end)
                 break;
             else
                 os << " ";
@@ -96,7 +96,7 @@ senf::console::detail::CollectionReturnValueTraits<Collection>::format(Collectio
     os << ")";
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::detail::MapArgumentTraits<Collection>
 
 template <class Collection>
@@ -120,12 +120,7 @@ parse(ParseCommandInfo::TokensRange const & tokens, Collection & out)
 template <class Collection>
 prefix_ std::string senf::console::detail::MapArgumentTraits<Collection>::description()
 {
-    std::string type (prettyName(typeid(Collection)));
-    std::string::size_type e (type.find('<'));
-    if (e == std::string::npos) e = type.size();
-    std::string::size_type b (type.rfind(':', e));
-    if (b == std::string::npos) b = 0; else ++b;
-    return type.substr(b,e-b) + "<" 
+    return senf::prettyBaseName(typeid(Collection)) + "<"
         + ArgumentTraits<typename Collection::key_type>::description() + ","
         + ArgumentTraits<typename Collection::mapped_type>::description() + ">";
 }
@@ -139,7 +134,7 @@ senf::console::detail::MapArgumentTraits<Collection>::str(Collection const & val
     return ss.str();
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::detail::MapReturnValueTraits<Collection>
 
 template <class Collection>
@@ -152,10 +147,10 @@ senf::console::detail::MapReturnValueTraits<Collection>::format(Collection const
     typename type::const_iterator const i_end (value.end());
     if (i != i_end)
         for (;;) {
-            senf::console::format(i->first, os);
-            os << "=";
-            senf::console::format(i->second, os);
-            if (++i == i_end) 
+            os << senf::console::str(i->first)
+               << "="
+               << senf::console::str(i->second);
+            if (++i == i_end)
                 break;
             else
                 os << " ";
@@ -163,7 +158,7 @@ senf::console::detail::MapReturnValueTraits<Collection>::format(Collection const
     os << ")";
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::ArgumentTraits< std::pair<T1,T2> >
 
 template <class T1, class T2>
@@ -191,23 +186,20 @@ prefix_ std::string senf::console::ArgumentTraits< std::pair<T1,T2> >::str(type
     return ss.str();
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::ReturnValueTraits< std::pair<T1,T2> >
 
 template <class T1, class T2>
 prefix_ void senf::console::ReturnValueTraits< std::pair<T1,T2> >::format(type const & value,
                                                                           std::ostream & os)
 {
-    os << "(";
-    senf::console::format(value.first, os);
-    os << " ";
-    senf::console::format(value.second, os);
-    os << ")";
+    os << "(" << senf::console::str(value.first)
+       << " " << senf::console::str(value.second) << ")";
 }
 
 #endif
 
-///////////////////////////////ct.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_