From 3fb0c5f4f00f86519c93413ab2386c47c5224345 Mon Sep 17 00:00:00 2001
From: jean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Date: Wed, 20 Feb 2008 16:05:38 +0000
Subject: [PATCH] Fix typo

---
 kernel/src/bbtkAny.h            | 24 ++++++++++++------------
 kernel/src/bbtkAtomicBlackBox.h |  6 +++---
 kernel/src/bbtkBlackBox.cxx     | 14 +++++++-------
 kernel/src/bbtkBlackBox.h       | 10 +++++-----
 kernel/src/bbtkConnection.h     | 24 ++++++------------------
 5 files changed, 33 insertions(+), 45 deletions(-)

diff --git a/kernel/src/bbtkAny.h b/kernel/src/bbtkAny.h
index 45ed576..d5ae85f 100644
--- a/kernel/src/bbtkAny.h
+++ b/kernel/src/bbtkAny.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkAny.h,v $
   Language:  C++
-  Date:      $Date: 2008/01/22 15:02:00 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/02/20 16:05:38 $
+  Version:   $Revision: 1.2 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See doc/license.txt or
@@ -113,18 +113,18 @@ namespace bbtk
   class anyholder<ValueType*> : public anyplaceholder
   {
   public: // structors
-    
+
     anyholder(ValueType* const & value)
       : held(value)
     { }
-    
+
   public: // queries
-    
+
     virtual const std::type_info & type() const
     {
       return typeid(ValueType*);
     }
-    
+
     virtual bool is_pointer() const { return true; }
     virtual const std::type_info & pointed_type() const { return typeid(ValueType); }
     virtual void* get_pointer() const { 
@@ -136,11 +136,11 @@ namespace bbtk
     }
 
     virtual anyplaceholder * clone() const { return new anyholder(held); }
-    
+
   public: // representation
-    
+
     ValueType* held;
-    
+
   };
   //=========================================================
 
@@ -174,13 +174,13 @@ namespace bbtk
   public:
     typedef any< TypeTraits > self;
     // structors
-  
+
     /// Default constructor
     any()
       : content(0)
     {
     }
-  
+
     /// Constructor with a value of template type
     template<typename ValueType>
     any(const ValueType & value)
@@ -223,7 +223,7 @@ namespace bbtk
     {
       delete content;
     }
-  
+
 
     /// Swaps the content of this with another any
     any & swap(any & rhs)
diff --git a/kernel/src/bbtkAtomicBlackBox.h b/kernel/src/bbtkAtomicBlackBox.h
index a0102bb..4422063 100644
--- a/kernel/src/bbtkAtomicBlackBox.h
+++ b/kernel/src/bbtkAtomicBlackBox.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkAtomicBlackBox.h,v $
   Language:  C++
-  Date:      $Date: 2008/02/07 11:06:37 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/02/20 16:05:38 $
+  Version:   $Revision: 1.2 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -82,7 +82,7 @@ namespace bbtk
     ///
     /// First checks that re-processing is needed (either Status==MODIFIED or InputProcessMode==Always)
     /// then : 
-    /// - updates its inputs by calling bbUpdateInputs (which recursively calls bbBackwardUpdate on amont boxes)
+    /// - updates its inputs by calling bbUpdateInputs (which recursively calls bbBackwardUpdate on upstream boxes)
     /// - calls bbProcess which here simply calls the user callback bbUserProcess which does the actual processing. 
     ///    bbProcess is overloaded in WxBlackBox to handle widget creation and show
     IOStatus bbBackwardUpdate(Connection* caller);
diff --git a/kernel/src/bbtkBlackBox.cxx b/kernel/src/bbtkBlackBox.cxx
index 1c980b7..7955ccf 100644
--- a/kernel/src/bbtkBlackBox.cxx
+++ b/kernel/src/bbtkBlackBox.cxx
@@ -3,8 +3,8 @@
 Program:   bbtk
 Module:    $RCSfile: bbtkBlackBox.cxx,v $
 Language:  C++
-Date:      $Date: 2008/02/18 10:41:02 $
-Version:   $Revision: 1.4 $
+Date:      $Date: 2008/02/20 16:05:38 $
+Version:   $Revision: 1.5 $
                                                                                 
 Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
 l'Image). All rights reserved. See doc/license.txt or
@@ -465,10 +465,10 @@ namespace bbtk
       }
   if (reaction) bbGlobalProcessExecutionList();
 
-    bbtkDebugMessageDec("Process",5,
-			"<= BlackBox::bbSignalOutputModification("
-			<<output<<") ["
-			<<bbGetFullName()<<"]"<<std::endl);
+  bbtkDebugMessageDec("Process",5,
+                      "<= BlackBox::bbSignalOutputModification("
+                      <<output<<") ["
+                      <<bbGetFullName()<<"]"<<std::endl);
 
   }  
   //=========================================================================   
@@ -520,7 +520,7 @@ namespace bbtk
 			<<std::endl);	
 
     IOStatus s = UPTODATE;
-    
+
     InputConnectorMapType::iterator i;
     for ( i = bbGetInputConnectorMap().begin(); 
 	  i!= bbGetInputConnectorMap().end(); ++i) 
diff --git a/kernel/src/bbtkBlackBox.h b/kernel/src/bbtkBlackBox.h
index 1c80963..abe50e0 100644
--- a/kernel/src/bbtkBlackBox.h
+++ b/kernel/src/bbtkBlackBox.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkBlackBox.h,v $
   Language:  C++
-  Date:      $Date: 2008/01/22 15:02:00 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/02/20 16:05:38 $
+  Version:   $Revision: 1.2 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See doc/license.txt or
@@ -286,7 +286,7 @@ bool reaction = true);
     ///
     /// First checks that re-processing is needed (either Status==MODIFIED or InputProcessMode==Always)
     /// then : 
-    /// - updates its inputs by calling bbUpdateInputs (which recursively calls bbBackwardUpdate on amont boxes)
+    /// - updates its inputs by calling bbUpdateInputs (which recursively calls bbBackwardUpdate on upstream boxes)
     /// - calls bbCreateWidget
     /// - calls bbProcess which is the user callback which does the actual processing
     /// - calls bbUpdateChildren
@@ -312,12 +312,12 @@ bool reaction = true);
     //==================================================================
     /// Updates the BlackBox inputs and returns the final status of the inputs 
     /// (==UPTODATE iff all inputs are UPTODATE)  
-    // If excludeParent == true then excludes the amont box connected to input 'Parent' from recursive update
+    // If excludeParent == true then excludes the upstream box connected to input 'Parent' from recursive update
     IOStatus bbUpdateInputs(bool excludeParent=false);
     //==================================================================
 
     //==================================================================
-    /// Updates the pipeline in amont-aval direction along the "Child"-"Parent" connections only.
+    /// Updates the pipeline in upstream-downstream direction along the "Child"-"Parent" connections only.
     /// Does nothing here. Overloaded in WxContainerBlackbox
     //virtual void bbUpdateChildren( Connection* caller ) { }
     //==================================================================
diff --git a/kernel/src/bbtkConnection.h b/kernel/src/bbtkConnection.h
index 09a5d7f..4a79968 100644
--- a/kernel/src/bbtkConnection.h
+++ b/kernel/src/bbtkConnection.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkConnection.h,v $
   Language:  C++
-  Date:      $Date: 2008/01/22 15:02:00 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/02/20 16:05:38 $
+  Version:   $Revision: 1.2 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See doc/license.txt or
@@ -41,16 +41,11 @@ namespace bbtk
   const int UPTODATE = 1;
   /// 
   const int UPDATING = 2;
- 
-
-
 
   class BlackBox;
   class BlackBoxInputConnector;
   class BlackBoxOutputConnector;
 
-
-
   class BBTK_EXPORT Connection
   {
   public:
@@ -61,16 +56,15 @@ namespace bbtk
     ~Connection();
 
     /// Amont direction pipeline processing
-    /// 1) call bbBackwardUpdate(this) on the amont box
-    /// 2) copies the amont box output to the aval box input adapting it if needed
+    /// 1) call bbBackwardUpdate(this) on the upstream box
+    /// 2) copies the upstream box output to the downstream box input adapting it if needed
     virtual IOStatus BackwardUpdate();
 
     /// Aval direction pipeline processing :
-    /// 1) copies the amont box output to the aval box input adapting it if needed
-    /// 2) call bbForwardUpdate(this) on the aval box
+    /// 1) copies the upstream box output to the downstream box input adapting it if needed
+    /// 2) call bbForwardUpdate(this) on the downstream box
     //    virtual void ForwardUpdate();
 
-
     virtual void SetModifiedStatus();
     std::string GetFullName() const; 
 
@@ -83,8 +77,6 @@ namespace bbtk
     /// Returns the input of the final black box of the connection
     const std::string& GetBlackBoxToInput() const { return mInput; }
 
-    
-
   protected:
     /// Black box origin of the connection
     BlackBox* mFrom;
@@ -111,7 +103,6 @@ namespace bbtk
     /// Have to do dynamic_cast ?
     bool mDoDynamicCast;
 
-  
     /// Ctor with the black box from and to and their input and output
     /// and a dummy int to differentiate from the public constructor.
     /// Sets the members but does not test compatibility (used by bbtk::AdaptiveConnection)
@@ -121,10 +112,7 @@ namespace bbtk
     void TransferData(); 
   };
 
-
 }// namespace bbtk
 
-
-
 #endif
 
-- 
2.45.1