X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FScopedDirectory.cti;h=a5d54621c6f221dc743efb47eb78c5b79361672d;hb=0003d55730b447329342161d12cf2ed23b63459e;hp=69b70faab34dabf854777a7da2860a7156c4a910;hpb=084d18afd1abb3c6b19de612dbdf4dbc40ffd795;p=senf.git

diff --git a/senf/Utils/Console/ScopedDirectory.cti b/senf/Utils/Console/ScopedDirectory.cti
index 69b70fa..a5d5462 100644
--- a/senf/Utils/Console/ScopedDirectory.cti
+++ b/senf/Utils/Console/ScopedDirectory.cti
@@ -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 template implementation */
@@ -26,104 +31,84 @@
 //#include "ScopedDirectory.ih"
 
 // Custom includes
-#include <boost/bind.hpp>
 
 #define prefix_ inline
-///////////////////////////////cti.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
-// senf::console::OwnerNodeCreateTraits<Owner,Object>::Creator
-
-template <class Owner, class Object>
-prefix_ typename senf::console::OwnerNodeCreateTraits<Owner,Object>::result_type
-senf::console::OwnerNodeCreateTraits<Owner,Object>::Creator::create(DirectoryNode & node,
-                                                                    Owner & owner,
-                                                                    std::string const & name,
-                                                                    Object & ob)
-{
-    return senf_console_add_node(node, owner, name, ob, 0);
-}
-
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::ScopedDirectory<Owner>
 
 template <class Owner>
 prefix_ senf::console::ScopedDirectory<Owner>::ScopedDirectory(Owner * owner)
     : owner_ (owner)
 {
-    SENF_ASSERT(owner_);
+    SENF_ASSERT(owner_, "ScopedDirectory owner is mandatory");
 }
 
 template <class Owner>
-template <class Object>
-prefix_ typename senf::console::OwnerNodeCreateTraits<Owner, Object const>::result_type
-senf::console::ScopedDirectory<Owner>::add(std::string const & name, Object const & ob)
+template <class NodeType>
+prefix_ NodeType & senf::console::ScopedDirectory<Owner>::add(std::string const & name,
+                                                              boost::shared_ptr<NodeType> othernode)
 {
-    return OwnerNodeCreateTraits<Owner, Object const>::Creator::create(node(), *owner_, name, ob);
+    return node().add(name, othernode);
 }
 
 template <class Owner>
-template <class Object>
-prefix_ typename senf::console::OwnerNodeCreateTraits<Owner, Object>::result_type
-senf::console::ScopedDirectory<Owner>::add(std::string const & name, Object & ob)
+template <class NodeType>
+prefix_ NodeType & senf::console::ScopedDirectory<Owner>::
+add(std::string const & name, NodeType & othernode,
+    typename boost::enable_if< boost::is_convertible<NodeType &, GenericNode &> >::type *)
 {
-    return OwnerNodeCreateTraits<Owner, Object>::Creator::create(node(), *owner_, name, ob);
-}
-
-#ifndef DOXYGEN
-
-template <class Owner, class Function>
-prefix_ senf::console::SimpleCommandNode & senf::console::
-senf_console_add_node(DirectoryNode & node, Owner & , std::string const & name,
-                      SimpleCommandNode::Function fn, int)
-{
-    return node.add(name,fn);
+    return node().add(name,othernode);
 }
 
 template <class Owner>
-prefix_ senf::console::SimpleCommandNode & senf::console::
-senf_console_add_node(DirectoryNode & node, Owner & owner, std::string const & name,
-                      void (Owner::*fn)(std::ostream &, ParseCommandInfo const &), int)
+template <class Factory>
+prefix_ typename Factory::result_type senf::console::ScopedDirectory<Owner>::
+add(std::string const & name, Factory const & factory,
+    typename boost::enable_if< boost::is_convertible<Factory*, detail::OwnedNodeFactory*> >::type *)
 {
-    return node.add(name, boost::bind(fn,boost::ref(owner),_1,_2));
+    return factory.create(*owner_, name, node());
 }
 
 template <class Owner>
-prefix_ senf::console::DirectoryNode &
-senf::console::senf_console_add_node(DirectoryNode & node, Owner & owner,
-                                     std::string const & name, DirectoryNode & dir, int)
+template <class Factory>
+prefix_ typename Factory::result_type senf::console::ScopedDirectory<Owner>::
+add(std::string const & name, Factory const & factory,
+    typename boost::enable_if< boost::is_convertible<Factory*, detail::NodeFactory*> >::type *,
+    typename boost::disable_if< boost::is_convertible<Factory*, detail::OwnedNodeFactory*> >::type *)
 {
-    return node.add(name, dir.thisptr());
+    return node().add(name, factory);
 }
 
-template <class Node>
-prefix_ senf::console::DirectoryNode & senf::console::
-senf_console_add_node(DirectoryNode & dir, std::string const & name, Node const & node, int,
-                      typename boost::enable_if< boost::is_convertible<Node*, ScopedDirectoryBase*> >::type *)
-{
-    return dir.add(name, node.node().thisptr());
-}
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
+// senf::console::ScopedDirectory<void>
 
-#endif
 
-///////////////////////////////////////////////////////////////////////////
-// senf::console::ScopedDirectory<void>
+template <class NodeType>
+prefix_ NodeType & senf::console::ScopedDirectory<void>::add(std::string const & name,
+                                                             boost::shared_ptr<NodeType> othernode)
+{
+    return node().add(name,othernode);
+}
 
-template <class Object>
-prefix_ typename senf::console::NodeCreateTraits<Object>::result_type
-senf::console::ScopedDirectory<void>::add(std::string const & name, Object const & ob)
+template <class NodeType>
+prefix_ NodeType & senf::console::ScopedDirectory<void>::
+add(std::string const & name, NodeType & othernode,
+    typename boost::enable_if< boost::is_convertible<NodeType &, GenericNode &> >::type *)
 {
-    return node().add(name, ob);
+    return node().add(name,othernode);
 }
 
-template <class Object>
-prefix_ typename senf::console::NodeCreateTraits<Object>::result_type
-senf::console::ScopedDirectory<void>::add(std::string const & name, Object & ob)
+template <class Factory>
+prefix_ typename Factory::result_type senf::console::ScopedDirectory<void>::
+add(std::string const & name, Factory const & factory,
+    typename boost::enable_if< boost::is_convertible<Factory*, detail::NodeFactory*> >::type *)
 {
-    return node().add(name, ob);
+    return node().add(name,factory);
 }
 
-///////////////////////////////cti.e///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_