X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FUtility.ct;h=026e1000779ea8759526dd4398a42283ed8738e4;hb=refs%2Fheads%2Fmaster;hp=603bbc7b0f7ace185f4cd13bc4c7dae99b7bb56a;hpb=7661548b20e6c7627f54bff87e0758396fd523ef;p=senf.git

diff --git a/senf/Utils/Console/Utility.ct b/senf/Utils/Console/Utility.ct
index 603bbc7..026e100 100644
--- a/senf/Utils/Console/Utility.ct
+++ b/senf/Utils/Console/Utility.ct
@@ -2,23 +2,28 @@
 //
 // 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 Utility non-inline template implementation  */
@@ -42,7 +47,7 @@ prefix_ void senf::console::ArgumentTraits< senf::console::CharAsString<CharT> >
 parse(ParseCommandInfo::TokensRange const & tokens, CharAsString<CharT> & out)
 {
     std::string v;
-    senf::console::parse(tokens,v);
+    console::parse(tokens,v);
     if (v.size() != 1)
         throw SyntaxErrorException("Invalid size of character constant");
     out.value = static_cast<CharT>(v[0]);
@@ -59,14 +64,14 @@ template <class CharT>
 prefix_ std::string senf::console::ArgumentTraits< senf::console::CharAsString<CharT> >::
 str(CharAsString<CharT> value)
 {
-    return senf::console::str(std::string(1,value.value));
+    return console::str(std::string(1,value.value));
 }
 
 template <class CharT>
 prefix_ void senf::console::ReturnValueTraits< senf::console::CharAsString<CharT> >::
 format(CharAsString<CharT> value, std::ostream & os)
 {
-    return senf::console::format(std::string(1,value.value),os);
+    console::format(std::string(1,value.value),os);
 }
 
 //-/////////////////////////////////////////////////////////////////////////////////////////////////
@@ -77,7 +82,7 @@ prefix_ void senf::console::ArgumentTraits< senf::console::ValueRange<T> >::
 parse(ParseCommandInfo::TokensRange const & tokens, type & out)
 {
     if (tokens.size() != 1)
-        throw senf::console::SyntaxErrorException("parameter syntax error");
+        throw SyntaxErrorException("parameter syntax error");
     std::string v (tokens.begin()[0].value());
     std::string::size_type i (v.find(':'));
     try {
@@ -89,7 +94,7 @@ parse(ParseCommandInfo::TokensRange const & tokens, type & out)
         }
     }
     catch (std::bad_cast & ex) {
-        throw senf::console::SyntaxErrorException("parameter syntax error");
+        throw SyntaxErrorException("parameter syntax error");
     }
 }
 
@@ -132,7 +137,7 @@ parse(ParseCommandInfo::TokensRange const & tokens, type & out)
     out.value = 0;
     while (arg) {
         Enum v;
-        senf::console::parse( *(arg++), v);
+        console::parse( *(arg++), v);
         out.value |= v;
     }
 }
@@ -149,7 +154,7 @@ prefix_ std::string
 senf::console::ArgumentTraits< senf::console::FlagCollection<Enum> >::str(type const & value)
 {
     std::stringstream ss;
-    senf::console::format(value, ss);
+    console::format(value, ss);
     return ss.str();
 }
 
@@ -166,7 +171,7 @@ format(type const & value, std::ostream & os)
     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);
+            console::format(static_cast<Enum>(flag), ss);
         }
     }
     os << (n != 1 ? "(" + ss.str() + ")" : ss.str());