X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FOverloadedCommand.cc;h=e311adf0cf65938d911ff2dc88694b23dc83c0a1;hb=1342c5d49ca8bd523c9fdf7d89b40448cdfd394b;hp=8205ec5861a95914626159541cf437a5b4564489;hpb=f13780e9e4da7df981d6f6542fbdc714beb34765;p=senf.git diff --git a/senf/Utils/Console/OverloadedCommand.cc b/senf/Utils/Console/OverloadedCommand.cc index 8205ec5..e311adf 100644 --- a/senf/Utils/Console/OverloadedCommand.cc +++ b/senf/Utils/Console/OverloadedCommand.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 // -// 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 /** \file \brief OverloadedCommand non-inline non-template implementation */ @@ -30,9 +35,9 @@ //#include "OverloadedCommand.mpp" #define prefix_ -///////////////////////////////cc.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::console::OverloadedCommandNode prefix_ senf::console::OverloadedCommandNode & @@ -48,7 +53,7 @@ senf::console::OverloadedCommandNode::insertOverload(DirectoryNode & dir, return node; } -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // So soll die doku aussehen: // // Usage: @@ -62,14 +67,14 @@ senf::console::OverloadedCommandNode::insertOverload(DirectoryNode & dir, // default: 1.23 // arg3 - arg3-doc // -// Generic documentation foo blalsdljfl laj flkajslkjs fdlkj oiwlksdj ;llkaj +// Generic documentation foo blalsdljfl laj flkajslkjs fdlkj oiwlksdj ;llkaj // sdflkja sldkfjslkdfj sdlkfj lskjdf lskjdf lksj dflkj lsdkfj lskdjf lskjkd -// Generic documentation foo blalsdljfl laj flkajslkjs fdlkj oiwlksdj ;llkaj +// Generic documentation foo blalsdljfl laj flkajslkjs fdlkj oiwlksdj ;llkaj // sdflkja sldkfjslkdfj sdlkfj lskjdf lskjdf lksj dflkj lsdkfj lskdjf lskjkd -// Generic documentation foo blalsdljfl laj flkajslkjs fdlkj oiwlksdj ;llkaj +// Generic documentation foo blalsdljfl laj flkajslkjs fdlkj oiwlksdj ;llkaj // sdflkja sldkfjslkdfj sdlkfj lskjdf lskjdf lksj dflkj lsdkfj lskdjf lskjkd // -// Variant 1: +// Variant 1: // Variant 1 doc la;ksjf lkj sdlkfj lkjekj sdflkj ekljsdlkfj wlej // slkj dkj sldkfj lwekljsdf skldjf lskjdf l jsd // @@ -78,7 +83,7 @@ senf::console::OverloadedCommandNode::insertOverload(DirectoryNode & dir, // // Variatn 3: // Variant 3 doc slkjflw ekj lskdfj lskdjf laksdj flksj elkj aldskjf lwkejlksdj -// ldkfaj wlekj slkdfj lskdjf lwkejlkasdjf +// ldkfaj wlekj slkdfj lskdjf lwkejlkasdjf prefix_ void senf::console::OverloadedCommandNode::v_help(std::ostream & os) const @@ -137,8 +142,8 @@ prefix_ void senf::console::OverloadedCommandNode::v_help(std::ostream & os) ArgumentDocs::const_iterator const i_end (argumentDocs.end()); for (; i != i_end; ++i) { if (! i->doc.empty() || ! i->defaultValue.empty()) { - os << " " - << i->name + os << " " + << i->name << std::string(i->name.length()<8 ? 8-i->name.length() : 0, ' ') << " " << i->doc @@ -148,10 +153,10 @@ prefix_ void senf::console::OverloadedCommandNode::v_help(std::ostream & os) } } } - + if (! doc_.empty()) os << "\n" << doc_ << "\n"; - + { Overloads::const_iterator i (overloads_.begin()); Overloads::const_iterator const i_end (overloads_.end()); @@ -179,7 +184,7 @@ prefix_ std::string senf::console::OverloadedCommandNode::v_shorthelp() Overloads::const_iterator const i_end (overloads_.end()); for (; i != i_end; ++i) { std::string overloadDoc ((*i)->doc()); - if (! overloadDoc.empty()) + if (! overloadDoc.empty()) return overloadDoc.substr(0,overloadDoc.find('\n')); } return ""; @@ -205,7 +210,7 @@ prefix_ void senf::console::OverloadedCommandNode::v_execute(boost::any & rv, throw err; } -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::console::SimpleCommandOverload prefix_ unsigned senf::console::SimpleCommandOverload::v_numArguments() @@ -232,7 +237,7 @@ prefix_ void senf::console::SimpleCommandOverload::v_execute(boost::any & rv, fn_(os, command); } -///////////////////////////////cc.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_ //#include "OverloadedCommand.mpp"