X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FNode.cci;h=0c02742b6a83488bb79c6b6be0640699f115603d;hb=refs%2Fheads%2Fmaster;hp=21482ffb239be81cabd7b1a5f98ff025ac52a477;hpb=9cb871b939efe93e35dd96808d25089399acfc46;p=senf.git

diff --git a/senf/Utils/Console/Node.cci b/senf/Utils/Console/Node.cci
index 21482ff..0c02742 100644
--- a/senf/Utils/Console/Node.cci
+++ b/senf/Utils/Console/Node.cci
@@ -2,35 +2,38 @@
 //
 // 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 inline non-template implementation */
 
-#include "Node.ih"
-
 // Custom includes
 
 #define prefix_ inline
-///////////////////////////////cci.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::GenericNode
 
 prefix_ senf::console::GenericNode::ptr senf::console::GenericNode::thisptr()
@@ -134,7 +137,7 @@ prefix_ senf::console::GenericNode & senf::console::GenericNode::followLink()
         : *this;
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::LinkNode
 
 prefix_ senf::console::GenericNode & senf::console::LinkNode::follow()
@@ -155,7 +158,7 @@ prefix_ senf::console::LinkNode::LinkNode(GenericNode & node)
     : node_ (node.thisptr())
 {}
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::DirectoryNode
 
 prefix_ senf::console::DirectoryNode::ptr senf::console::DirectoryNode::create()
@@ -253,19 +256,7 @@ prefix_ senf::console::DirectoryNode::cptr senf::console::DirectoryNode::thisptr
     return boost::static_pointer_cast<DirectoryNode const>(shared_from_this());
 }
 
-///////////////////////////////////////////////////////////////////////////
-// senf::console::detail::NodeTraverser
-#ifndef DOXYGEN
-
-prefix_ senf::console::detail::NodeTraverser::NodeTraverser(DirectoryNode & root,
-                                                            DirectoryNode & dir,
-                                                            bool autocomplete)
-    : root_ (root), dir_ (dir.thisptr()), autocomplete_ (autocomplete), init_ (false)
-{}
-
-#endif
-
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::CommandNode
 
 prefix_ senf::console::CommandNode::ptr senf::console::CommandNode::thisptr()
@@ -312,7 +303,7 @@ prefix_ void senf::console::CommandNode::operator()(boost::any & rv, std::ostrea
     execute(rv, output, command);
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::SimpleCommandNode
 
 prefix_ senf::console::SimpleCommandNode::SimpleCommandNode(Function const & fn)
@@ -350,7 +341,7 @@ prefix_ senf::console::SimpleCommandNode::cptr senf::console::SimpleCommandNode:
     return boost::static_pointer_cast<SimpleCommandNode const>(shared_from_this());
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 prefix_ senf::console::DirectoryNode & senf::console::provideDirectory(DirectoryNode & dir,
                                                                        std::string const & name)
@@ -359,7 +350,7 @@ prefix_ senf::console::DirectoryNode & senf::console::provideDirectory(Directory
 }
 
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::factory::SimpleCommand
 
 prefix_ senf::console::factory::SimpleCommand::SimpleCommand(SimpleCommandNode::Function fn)
@@ -389,7 +380,7 @@ senf::console::factory::SimpleCommand::shortdoc(std::string const & doc)
     return *this;
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::factory::Directory
 
 prefix_ senf::console::factory::Directory::Directory()
@@ -419,7 +410,7 @@ senf::console::factory::Directory::shortdoc(std::string const & doc)
     return *this;
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::factory::Link
 
 prefix_ senf::console::factory::Link::Link(GenericNode & target)
@@ -433,7 +424,7 @@ prefix_ senf::console::LinkNode & senf::console::factory::Link::create(Directory
     return dir.add(name, node_);
 }
 
-///////////////////////////////cci.e///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_