X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FScopedDirectory.cci;h=40562cf5c85c6ef630c530bf2fdb70c0bc718d90;hb=1342c5d49ca8bd523c9fdf7d89b40448cdfd394b;hp=6f868b70cd6b6144fc744d3861eb856d3cd72ad9;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Utils/Console/ScopedDirectory.cci b/senf/Utils/Console/ScopedDirectory.cci
index 6f868b7..40562cf 100644
--- a/senf/Utils/Console/ScopedDirectory.cci
+++ b/senf/Utils/Console/ScopedDirectory.cci
@@ -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 <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 ScopedDirectory inline non-template implementation */
@@ -28,9 +33,9 @@
 // Custom includes
 
 #define prefix_ inline
-///////////////////////////////cci.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::ScopedDirectoryBase
 
 prefix_ senf::console::DirectoryNode & senf::console::ScopedDirectoryBase::node()
@@ -92,29 +97,65 @@ senf::console::ScopedDirectoryBase::get(std::string const & name)
     return node().get(name);
 }
 
+prefix_ senf::console::DirectoryNode::ChildrenRange
+senf::console::ScopedDirectoryBase::children()
+    const
+{
+    return node().children();
+}
+
 prefix_ senf::console::DirectoryNode &
-senf::console::ScopedDirectoryBase::mkdir(std::string const & name)
+senf::console::ScopedDirectoryBase::doc(std::string const & doc)
 {
-    return node().mkdir(name);
+    return node().doc(doc);
 }
 
-prefix_ void senf::console::ScopedDirectoryBase::link(std::string const & name,
-                                                      GenericNode & target)
+prefix_ std::string const & senf::console::ScopedDirectoryBase::name()
+    const
 {
-    return node().link(name, target);
+    return node().name();
 }
 
-prefix_ senf::console::DirectoryNode::ChildrenRange
-senf::console::ScopedDirectoryBase::children()
+prefix_ bool senf::console::ScopedDirectoryBase::active()
     const
 {
-    return node().children();
+    return node().active();
 }
 
-prefix_ senf::console::DirectoryNode &
-senf::console::ScopedDirectoryBase::doc(std::string const & doc)
+prefix_ std::string senf::console::ScopedDirectoryBase::path()
+    const
 {
-    return node().doc(doc);
+    return node().path();
+}
+
+prefix_ std::string senf::console::ScopedDirectoryBase::path(DirectoryNode const & root)
+    const
+{
+    return node().path(root);
+}
+
+prefix_ boost::shared_ptr<senf::console::DirectoryNode>
+senf::console::ScopedDirectoryBase::parent()
+    const
+{
+    return node().parent();
+}
+
+prefix_ senf::console::GenericNode::ptr senf::console::ScopedDirectoryBase::unlink()
+{
+    return node().unlink();
+}
+
+prefix_ void senf::console::ScopedDirectoryBase::help(std::ostream & output)
+    const
+{
+    node().help( output);
+}
+
+prefix_ std::string senf::console::ScopedDirectoryBase::shorthelp()
+    const
+{
+    return node().shorthelp();
 }
 
 prefix_ senf::console::ScopedDirectoryBase::ScopedDirectoryBase()
@@ -126,7 +167,7 @@ prefix_ senf::console::ScopedDirectoryBase::~ScopedDirectoryBase()
     node_->unlink();
 }
 
-///////////////////////////////cci.e///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_