X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FParsedCommand.cci;h=76f5920a6924752619b243087f4030819c776fa5;hb=0003d55730b447329342161d12cf2ed23b63459e;hp=5d168ecafeef6510e5f6eaa2ecb567ed0440440d;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Utils/Console/ParsedCommand.cci b/senf/Utils/Console/ParsedCommand.cci
index 5d168ec..76f5920 100644
--- a/senf/Utils/Console/ParsedCommand.cci
+++ b/senf/Utils/Console/ParsedCommand.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 ParsedCommand inline non-template implementation */
@@ -28,9 +33,9 @@
 // Custom includes
 
 #define prefix_ inline
-///////////////////////////////cci.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::detail::ArgumentInfoBase
 
 prefix_ senf::console::detail::ArgumentInfoBase::ArgumentInfoBase(std::string const & type_,
@@ -38,7 +43,7 @@ prefix_ senf::console::detail::ArgumentInfoBase::ArgumentInfoBase(std::string co
     : type (type_), name (), hasDefault (false), singleToken (singleToken_)
 {}
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::ParsedCommandOverloadBase
 
 prefix_ senf::console::ParsedCommandOverloadBase::ParsedCommandOverloadBase()
@@ -57,77 +62,73 @@ prefix_ void senf::console::ParsedCommandOverloadBase::doc(std::string const & d
     doc_ = d;
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::ParsedCommandAttributorBase
 
 prefix_ senf::console::OverloadedCommandNode &
-senf::console::ParsedCommandAttributorBase::node()
+senf::console::ParsedCommandAttributorBase::create(DirectoryNode & dir,
+                                                   std::string const & name)
     const
 {
-    return overload_.node();
+    OverloadedCommandNode & node (OverloadedCommandNode::insertOverload(dir, name, overload_));
+    if (doc_) node.doc(*doc_);
+    if (shortdoc_) node.shortdoc(*shortdoc_);
+    return node;
 }
 
-prefix_ senf::console::ParsedCommandAttributorBase::operator OverloadedCommandNode &()
-    const
-{
-    return node();
-}
+prefix_ senf::console::ParsedCommandAttributorBase::
+ParsedCommandAttributorBase(ParsedCommandOverloadBase::ptr overload, unsigned index)
+  : overload_ (overload), index_ (index)
+{}
 
 prefix_ senf::console::ParsedCommandAttributorBase::
-ParsedCommandAttributorBase(ParsedCommandOverloadBase & overload, unsigned index)
-    : overload_ (overload), index_ (index)
+ParsedCommandAttributorBase(ParsedCommandAttributorBase const & other, unsigned index)
+    : overload_ (other.overload_), index_ (index), doc_ (other.doc_), shortdoc_ (other.shortdoc_)
 {}
 
 prefix_ senf::console::ParsedCommandOverloadBase &
 senf::console::ParsedCommandAttributorBase::overload()
     const
 {
-    return overload_;
+    return *overload_;
 }
 
 prefix_ void senf::console::ParsedCommandAttributorBase::argName(std::string const & name)
-    const
 {
     overload().arg(index_).name = name;
 }
 
 prefix_ void senf::console::ParsedCommandAttributorBase::argDoc(std::string const & doc)
-    const
 {
     overload().arg(index_).doc = doc;
 }
 
 prefix_ void senf::console::ParsedCommandAttributorBase::typeName(std::string const & doc)
-    const
 {
     overload().arg(index_).type = doc;
 }
 
 prefix_ void senf::console::ParsedCommandAttributorBase::defaultDoc(std::string const & doc)
-    const
 {
     overload().arg(index_).defaultDoc = doc;
 }
 
 prefix_ void senf::console::ParsedCommandAttributorBase::overloadDoc(std::string const & doc)
-    const
 {
     overload().doc(doc);
 }
 
 prefix_ void senf::console::ParsedCommandAttributorBase::nodeDoc(std::string const & doc)
-    const
 {
-    node().doc(doc);
+    doc_ = doc;
 }
 
 prefix_ void senf::console::ParsedCommandAttributorBase::shortDoc(std::string const & doc)
-    const
 {
-    node().shortdoc(doc);
+    shortdoc_ = doc;
 }
 
-///////////////////////////////cci.e///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_