switch to new MPL based Fraunhofer FOKUS Public License

[senf.git] / senf / Utils / Console / Traits.cc

diff --git a/senf/Utils/Console/Traits.cc b/senf/Utils/Console/Traits.cc
index f85d6f5..f72880a 100644 (file)
--- a/senf/Utils/Console/Traits.cc
+++ b/senf/Utils/Console/Traits.cc
@@ -1,24 +1,29 @@
 // $Id$
 //
-// Copyright (C) 2008 
+// Copyright (C) 2008
 // 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 Traits non-inline non-template implementation */
@@ -31,22 +36,7 @@
 
 //#include "Traits.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
-
-prefix_ std::string senf::console::ArgumentTraits<std::string>::str(std::string const & value)
-{
-    if (! value.empty() && boost::algorithm::all(value, CommandParser::isWordChar))
-        return value;
-    else {
-        std::string rv (value);
-        for (std::string::size_type i (0); i < rv.size(); ++i)
-            if (rv[i] == '"' || rv[i] == '\\')
-                rv.insert(i++,"\\");
-        rv.insert(0,"\"");
-        rv.push_back('"');
-        return rv;
-    }
-}
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 prefix_ long senf::console::detail::parseEnum(EnumTable const & table,
                                               ParseCommandInfo::TokensRange const & tokens)
@@ -74,11 +64,11 @@ prefix_ long senf::console::detail::parseEnum(EnumTable const & table,
 prefix_ std::string senf::console::detail::formatEnum(EnumTable const & table, long value)
 {
     EnumTable::right_map::const_iterator i (table.right.find(value));
-    SENF_ASSERT( i != table.right.end() );
+    SENF_ASSERT( i != table.right.end(), "Invalid enum value" );
     return i->second;
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "Traits.mpp"