X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FTraits.ct;h=40b5e0ce04fea8cf5cf39823abd3f875e74d9cf9;hb=0003d55730b447329342161d12cf2ed23b63459e;hp=8749e9a8f2d6f8c1349366fcf21174ad0b64376f;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Utils/Console/Traits.ct b/senf/Utils/Console/Traits.ct
index 8749e9a..40b5e0c 100644
--- a/senf/Utils/Console/Traits.ct
+++ b/senf/Utils/Console/Traits.ct
@@ -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 template implementation  */
@@ -28,7 +33,7 @@
 // Custom includes
 
 #define prefix_
-///////////////////////////////ct.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 template <class Type>
 prefix_ bool
@@ -47,58 +52,7 @@ senf::console::senf_console_parse_argument(ParseCommandInfo::TokensRange const &
     return false;
 }
 
-///////////////////////////////////////////////////////////////////////////
-// senf::console::ArgumentTraits< senf::console::FlagCollection<Enum> >
-
-template <class Enum>
-prefix_ void senf::console::ArgumentTraits< senf::console::FlagCollection<Enum> >::
-parse(ParseCommandInfo::TokensRange const & tokens, type & out)
-{
-    CheckedArgumentIteratorWrapper arg (tokens);
-    out.value = 0;
-    while (arg) {
-        Enum v;
-        senf::console::parse( *(arg++), v);
-        out.value |= v;
-    }
-}
-
-template <class Enum>
-prefix_ std::string
-senf::console::ArgumentTraits< senf::console::FlagCollection<Enum> >::description()
-{
-    return ArgumentTraits<Enum>::description();
-}
-
-template <class Enum>
-prefix_ std::string
-senf::console::ArgumentTraits< senf::console::FlagCollection<Enum> >::str(type const & value)
-{
-    std::stringstream ss;
-    senf::console::format(value, ss);
-    return ss.str();
-}
-
-///////////////////////////////////////////////////////////////////////////
-// senf::console::ReturnValueTraits< senf::console::FlagCollection<Enum> >
-
-template <class Enum>
-prefix_ void senf::console::ReturnValueTraits< senf::console::FlagCollection<Enum> >::
-format(type const & value, std::ostream & os)
-{
-    unsigned n (0);
-    std::stringstream ss;
-    unsigned long flag (1);
-    for (unsigned bit (0); bit<sizeof(value.value)*CHAR_BIT; ++bit, flag<<=1) {
-        if (value.value & flag) {
-            if (n++) ss << " ";
-            senf::console::format(static_cast<Enum>(flag), ss);
-        }
-    }
-    os << (n != 1 ? "(" + ss.str() + ")" : ss.str());
-}
-
-///////////////////////////////ct.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_