=== MAJOR RELEASE ====

[bbtk.git] / packages / std / src / bbstdVectorToString.h

diff --git a/packages/std/src/bbstdVectorToString.h b/packages/std/src/bbstdVectorToString.h
index f5fc510daa1040896c8e241d0e38202cc2ad3e97..0a48b6cab6011b30dc6d79f27f5d786e24b47aee 100644 (file)
--- a/packages/std/src/bbstdVectorToString.h
+++ b/packages/std/src/bbstdVectorToString.h
@@ -1,41 +1,40 @@
 #ifndef __bbstdVectorToString_INCLUDED_h__
 #define __bbstdVectorToString_INCLUDED_h__
 
-#include "bbtkUserBlackBox.h"
+#include "bbtkAtomicBlackBox.h"
 
 namespace bbstd
 {
   //=================================================================
-  // UserBlackBox declaration
+  // BlackBox declaration
   template <class T>
-  class VectorToString : public bbtk::UserBlackBox
+  class VectorToString : public bbtk::AtomicBlackBox
   {  
-    BBTK_USER_BLACK_BOX_INTERFACE(VectorToString,bbtk::UserBlackBox);
-      BBTK_DECLARE_INPUT(In,std::vector<T>);
-      BBTK_DECLARE_INPUT(Separator,std::string);
-      BBTK_DECLARE_OUTPUT(Out,std::string);
+    BBTK_TEMPLATE_BLACK_BOX_INTERFACE(VectorToString,bbtk::AtomicBlackBox,T);
+    BBTK_DECLARE_INPUT(In,std::vector<T>);
+    BBTK_DECLARE_INPUT(Separator,std::string);
+    BBTK_DECLARE_OUTPUT(Out,std::string);
     BBTK_PROCESS(DoIt);
     void DoIt(); 
     virtual void bbUserConstructor();
   };
-
   //=================================================================
 
-  // UserBlackBox description
-  BBTK_BEGIN_DESCRIBE_TEMPLATE_BLACK_BOX(VectorToString);
-  BBTK_NAME(bbtk::TypeName<std::vector<T> >()+"ToString");
+  //=================================================================
+  // BlackBox description
+  BBTK_BEGIN_DESCRIBE_TEMPLATE_BLACK_BOX(VectorToString,bbtk::AtomicBlackBox);
+  BBTK_NAME(bbtk::HumanTypeName<std::vector<T> >()+"ToString");
   BBTK_AUTHOR("laurent.guigues@creatis.insa-lyon.fr");
-  BBTK_CATEGORY("adaptor");
   BBTK_DEFAULT_ADAPTOR();
   BBTK_DESCRIPTION("Converts the content of the input vector ("+bbtk::TypeName<std::vector<T> >()+") to a string in which each item is separated by the value of the input 'Separator'");
-    typedef std::vector<T> Tvector;
-    BBTK_TEMPLATE_INPUT(VectorToString, In,"Input",Tvector);
-    BBTK_TEMPLATE_INPUT(VectorToString, Separator,"Separator of item in the output string. Default is whitespace.",std::string);
-    BBTK_TEMPLATE_OUTPUT(VectorToString, Out,"Output",std::string);
+  typedef std::vector<T> Tvector;
+  BBTK_TEMPLATE_INPUT(VectorToString, In,"Input",Tvector);
+  BBTK_TEMPLATE_INPUT(VectorToString, Separator,"Separator of item in the output string. Default is whitespace.",std::string);
+  BBTK_TEMPLATE_OUTPUT(VectorToString, Out,"Output",std::string);
   BBTK_END_DESCRIBE_TEMPLATE_BLACK_BOX(VectorToString);
-  
   //=================================================================
 
+  //=================================================================
   template <class T>
   void VectorToString<T>::DoIt()
   {
@@ -51,9 +50,9 @@ namespace bbstd
     }
     bbSetOutputOut(out);
   }
-  
   //=================================================================
-  
+
+  //=================================================================  
   template <class T>
   void VectorToString<T>::bbUserConstructor()
   {