X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FNode.cc;h=d38096b8474a704380b198ab6f5e8a0c7e8834ea;hb=93d9568d448749dc187e7622b733a4a3caa319df;hp=0b143dd36d8471f7afd48835452d165c8d97703d;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git diff --git a/senf/Utils/Console/Node.cc b/senf/Utils/Console/Node.cc index 0b143dd..d38096b 100644 --- a/senf/Utils/Console/Node.cc +++ b/senf/Utils/Console/Node.cc @@ -1,6 +1,6 @@ // $Id$ // -// Copyright (C) 2008 +// Copyright (C) 2008 // Fraunhofer Institute for Open Communication Systems (FOKUS) // Competence Center NETwork research (NET), St. Augustin, GERMANY // Stefan Bund @@ -25,13 +25,13 @@ #include "Node.hh" #include "Node.ih" -#include // Custom includes +#include //#include "Node.mpp" #define prefix_ -///////////////////////////////cc.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// prefix_ senf::console::DirectoryNode & senf::console::root() { @@ -51,7 +51,7 @@ namespace { output << "/\n"; dodump(output, level+1,static_cast(*i->second)); } - else if (i->second->isLink()) + else if (i->second->isLink()) output << "@ -> " << i->second->followLink().path() << '\n'; else output << '\n'; @@ -64,7 +64,7 @@ prefix_ void senf::console::dump(std::ostream & os, DirectoryNode & dir) dodump(os,0,dir); } -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::console::GenericNode prefix_ std::string senf::console::GenericNode::path() @@ -114,7 +114,7 @@ prefix_ bool senf::console::GenericNode::isChildOf(DirectoryNode & parent) return node; } -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::console::LinkNode prefix_ void senf::console::LinkNode::v_help(std::ostream & os) @@ -129,7 +129,7 @@ prefix_ std::string senf::console::LinkNode::v_shorthelp() return follow().shorthelp(); } -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// //senf::console::DirectoryNode prefix_ senf::console::DirectoryNode::~DirectoryNode() @@ -144,7 +144,7 @@ prefix_ senf::console::GenericNode::ptr senf::console::DirectoryNode::remove(std::string const & name) { ChildMap::iterator i (children_.find(name)); - if (i == children_.end()) + if (i == children_.end()) throw UnknownNodeNameException() << ": '" << name << "'"; GenericNode::ptr node (i->second); children_.erase(i); @@ -167,7 +167,7 @@ prefix_ void senf::console::DirectoryNode::add(GenericNode::ptr node) ++suffix; newName = node->name() + "-" + boost::lexical_cast(suffix); } while (children_.find(newName) != children_.end()); - SENF_LOG((senf::log::MESSAGE)("Uniquifying node '" << node->name() << "' to '" + SENF_LOG((senf::log::MESSAGE)("Uniquifying node '" << node->name() << "' to '" << newName << "'")); node->name(newName); } @@ -199,7 +199,7 @@ prefix_ std::string senf::console::DirectoryNode::v_shorthelp() return doc_.substr(0,doc_.find('\n')); } -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::console::detail::NodeTraverser #ifndef DOXYGEN @@ -248,7 +248,7 @@ prefix_ senf::console::GenericNode & senf::console::detail::NodeTraverser::node( } #endif -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::console::SimpleCommandNode prefix_ void senf::console::SimpleCommandNode::v_help(std::ostream & output) @@ -272,7 +272,7 @@ prefix_ void senf::console::SimpleCommandNode::v_execute(boost::any & rv, std::o fn_(os, command); } -///////////////////////////////cc.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_ //#include "Node.mpp"