X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FNode.cc;h=965b798fb59e66184073fe88d5a0d2ecfdaa1a09;hb=refs%2Fheads%2Fmaster;hp=335eb73a520621d92f087254ce3e3b5aa51b0343;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Utils/Console/Node.cc b/senf/Utils/Console/Node.cc
index 335eb73..965b798 100644
--- a/senf/Utils/Console/Node.cc
+++ b/senf/Utils/Console/Node.cc
@@ -1,41 +1,45 @@
 // $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 Node non-inline non-template implementation */
 
 #include "Node.hh"
-#include "Node.ih"
-#include "../../Utils/range.hh"
 
 // Custom includes
+#include <senf/Utils/Range.hh>
 
 //#include "Node.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 prefix_ senf::console::DirectoryNode & senf::console::root()
 {
-    static DirectoryNode::ptr rootNode(new DirectoryNode());
+    static DirectoryNode::ptr rootNode (new DirectoryNode());
     return *rootNode;
 }
 
@@ -51,7 +55,7 @@ namespace {
                 output << "/\n";
                 dodump(output, level+1,static_cast<senf::console::DirectoryNode&>(*i->second));
             }
-            else if (i->second->isLink()) 
+            else if (i->second->isLink())
                 output << "@ -> " << i->second->followLink().path() << '\n';
             else
                 output << '\n';
@@ -64,7 +68,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 +118,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 +133,7 @@ prefix_ std::string senf::console::LinkNode::v_shorthelp()
     return follow().shorthelp();
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 //senf::console::DirectoryNode
 
 prefix_ senf::console::DirectoryNode::~DirectoryNode()
@@ -144,7 +148,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 +171,7 @@ prefix_ void senf::console::DirectoryNode::add(GenericNode::ptr node)
             ++suffix;
             newName = node->name() + "-" + boost::lexical_cast<std::string>(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,56 +203,7 @@ prefix_ std::string senf::console::DirectoryNode::v_shorthelp()
     return doc_.substr(0,doc_.find('\n'));
 }
 
-///////////////////////////////////////////////////////////////////////////
-// senf::console::detail::NodeTraverser
-#ifndef DOXYGEN
-
-prefix_ void senf::console::detail::NodeTraverser::operator()(std::string const & name)
-{
-    if (! init_) {
-        init_ = true;
-        if (name == std::string("")) {
-            dir_ = root_.thisptr();
-            return;
-        }
-    }
-    if (! elt_.empty()) {
-        if (elt_ == "..") {
-            dir_ = dir_->parent();
-            if (! dir_ || ! dir_->isChildOf(root_))
-                dir_ = root_.thisptr();
-        }
-        else if (elt_ != "" && elt_ != ".") {
-            if (! dir_->hasChild(elt_) && autocomplete_) {
-                DirectoryNode::ChildrenRange completions (dir_->completions(elt_));
-                if (has_one_elt(completions))
-                    elt_ = completions.begin()->first;
-            }
-            // Why does g++ give an error on this line ???? :
-            // dir = dynamic_cast<DirectoryNode&>( dir->get(name) ).thisptr();
-            DirectoryNode & d (dynamic_cast<DirectoryNode&>( dir_->get(elt_) ));
-            dir_ = d.thisptr();
-        }
-    }
-    elt_ = name;
-}
-
-prefix_ senf::console::GenericNode & senf::console::detail::NodeTraverser::node()
-{
-    if (elt_ != "" && elt_ != ".") {
-        if (! dir_->hasChild(elt_) && autocomplete_) {
-            DirectoryNode::ChildrenRange completions (dir_->completions(elt_));
-            if (has_one_elt(completions))
-                elt_ = completions.begin()->first;
-        }
-        return dir_->get(elt_);
-    }
-    else
-        return * dir_;
-}
-#endif
-
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::SimpleCommandNode
 
 prefix_ void senf::console::SimpleCommandNode::v_help(std::ostream & output)
@@ -272,7 +227,7 @@ prefix_ void senf::console::SimpleCommandNode::v_execute(boost::any & rv, std::o
     fn_(os, command);
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "Node.mpp"