From 71376d8384d5d21b5c56d36ecc8cbf31315c039a Mon Sep 17 00:00:00 2001
From: jean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Date: Tue, 5 Feb 2008 13:23:45 +0000
Subject: [PATCH] No longer 'Core' messages but 'Kernel' ones

---
 kernel/appli/bbfy/bbfy.cpp                    |  10 +-
 kernel/src/bbtkBlackBox.cxx                   |  66 ++++++------
 kernel/src/bbtkBlackBoxDescriptor.cxx         |  32 +++---
 kernel/src/bbtkBlackBoxInputConnector.cxx     |  14 +--
 kernel/src/bbtkBlackBoxOutputConnector.cxx    |  16 +--
 kernel/src/bbtkComplexBlackBox.cxx            | 100 +++++++++---------
 kernel/src/bbtkComplexBlackBoxDescriptor.cxx  |  40 +++----
 .../bbtkComplexBlackBoxInputDescriptor.cxx    |   8 +-
 .../bbtkComplexBlackBoxOutputDescriptor.cxx   |   8 +-
 kernel/src/bbtkConnection.cxx                 |  14 +--
 kernel/src/bbtkExecuter.cxx                   |  24 ++---
 kernel/src/bbtkFactory.cxx                    |  90 ++++++++--------
 kernel/src/bbtkInterpreter.cxx                |  10 +-
 kernel/src/bbtkMessageManager.cxx             |   6 +-
 kernel/src/bbtkMessageManager.h               |  10 +-
 kernel/src/bbtkPackage.cxx                    |  58 +++++-----
 kernel/src/bbtkUserBlackBox.cxx               |  14 +--
 kernel/src/bbtkUserBlackBoxGetSetFunctor.h    |   6 +-
 .../src/bbtkUserBlackBoxInputDescriptor.cxx   |   8 +-
 kernel/src/bbtkUserBlackBoxMacros.h           |  38 +++----
 .../src/bbtkUserBlackBoxOutputDescriptor.cxx  |   8 +-
 kernel/src/bbtkWxBlackBox.cxx                 |  18 ++--
 packages/wx/bbs/appli/testSplit.bbs           |   2 +-
 packages/wx/src/bbwxSizer.cxx                 |   8 +-
 packages/wx/src/bbwxSplit.cxx                 |   8 +-
 25 files changed, 308 insertions(+), 308 deletions(-)

diff --git a/kernel/appli/bbfy/bbfy.cpp b/kernel/appli/bbfy/bbfy.cpp
index 0c7972a..d5a6273 100644
--- a/kernel/appli/bbfy/bbfy.cpp
+++ b/kernel/appli/bbfy/bbfy.cpp
@@ -835,7 +835,7 @@ void bbfy::WriteGenericITKFilterHeader()
   mFile << "template <class T, unsigned int D>\n"
 	<< "void "<<mName<<"Generic::Process()\n"
 	<< "{\n"
-	<< "  bbtkDebugMessageInc(\"Core\",9,\n"
+	<< "  bbtkDebugMessageInc(\"Kernel\",9,\n"
 	<< "      \""<<mName 
 	<< "Generic::Process<\"<<TypeName<T>()<<\",\"<<D<<\">()\"<<std::endl);\n"
     
@@ -856,7 +856,7 @@ void bbfy::WriteGenericITKFilterHeader()
   mFile << "  f->bbUpdate();\n"
 	<< "  this->bbSetOutputOut( new itkImage( f->bbGetOutputOut() ) );\n"
 	<< "  f->UnRegister();\n"
-	<< "  bbtkDebugDecTab(\"Core\",9);\n"
+	<< "  bbtkDebugDecTab(\"Kernel\",9);\n"
 	<< "}\n\n";
   //=================================================================
 
@@ -938,19 +938,19 @@ void bbfy::CreateCode()
   // User constr / copy constr / destr implementation
   mFile <<"void "<<mName<<"::bbUserConstructor()"<<std::endl;
   mFile << "{"<<std::endl;
-  //mFile<<"bbtkDebugMessage(\"Core\",9,\""<<mName<<::bbUserConstructor()"<<std::endl);"<<std::endl;
+  //mFile<<"bbtkDebugMessage(\"Kernel\",9,\""<<mName<<::bbUserConstructor()"<<std::endl);"<<std::endl;
   mFile << mUserConstructor << std::endl;
   mFile << "}" << std::endl;
 
   mFile <<"void "<<mName<<"::bbUserCopyConstructor()"<<std::endl;
   mFile << "{"<<std::endl;
-  //mFile<<"bbtkDebugMessage(\"Core\",9,\""<<mName<<::bbUserCopyConstructor()"<<std::endl);"<<std::endl;
+  //mFile<<"bbtkDebugMessage(\"Kernel\",9,\""<<mName<<::bbUserCopyConstructor()"<<std::endl);"<<std::endl;
   mFile << mUserCopyConstructor << std::endl;
   mFile << "}" << std::endl;
 
   mFile <<"void "<<mName<<"::bbUserDestructor()"<<std::endl;
   mFile << "{"<<std::endl;
-  //mFile<<"bbtkDebugMessage(\"Core\",9,\""<<mName<<::bbUserDestructor()"<<std::endl);"<<std::endl;
+  //mFile<<"bbtkDebugMessage(\"Kernel\",9,\""<<mName<<::bbUserDestructor()"<<std::endl);"<<std::endl;
   mFile << mUserDestructor << std::endl;
   mFile << "}" << std::endl;
 
diff --git a/kernel/src/bbtkBlackBox.cxx b/kernel/src/bbtkBlackBox.cxx
index 3aa696a..f9cae86 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/01/22 15:02:00 $
-Version:   $Revision: 1.1 $
+Date:      $Date: 2008/02/05 13:23:46 $
+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
@@ -40,7 +40,7 @@ namespace bbtk
     : bbmName(name), bbmStatus(MODIFIED), 
       bbmBoxProcessMode("Pipeline"),bbmParent(NULL)
   {
-    bbtkDebugMessage("Core",7,"BlackBox::BlackBox(\""
+    bbtkDebugMessage("Kernel",7,"BlackBox::BlackBox(\""
 		     <<name<<"\")"<<std::endl);
   }
   //=========================================================================
@@ -52,7 +52,7 @@ namespace bbtk
       bbmStatus(from.bbmStatus), 
       bbmBoxProcessMode(from.bbmBoxProcessMode),bbmParent(NULL)
   {
-    bbtkDebugMessage("Core",7,"BlackBox::BlackBox("
+    bbtkDebugMessage("Kernel",7,"BlackBox::BlackBox("
 		     <<from.bbGetFullName()<<",\""
 		     <<name<<"\")"<<std::endl);
   }
@@ -63,10 +63,10 @@ namespace bbtk
   BlackBox::~BlackBox()
   {
     //    std::cout << "EED BlackBox::~BlackBox 01 [" << bbGetName()<<"]\n";
-    bbtkDebugMessageInc("Core",7,"BlackBox::~BlackBox()"<<std::endl);
+    bbtkDebugMessageInc("Kernel",7,"BlackBox::~BlackBox()"<<std::endl);
     this->bbDesallocateConnectors();
     //printf("EED BlackBox::~BlackBox 02 \n");
-    bbtkDebugDecTab("Core",7);
+    bbtkDebugDecTab("Kernel",7);
   }
   //=========================================================================
 
@@ -74,7 +74,7 @@ namespace bbtk
   /// Destruction method of a black box
   void BlackBox::bbDelete()
   {
-    bbtkDebugMessage("Core",5,"BlackBox::bbDelete() ["
+    bbtkDebugMessage("Kernel",5,"BlackBox::bbDelete() ["
 		     <<bbGetFullName()<<"]"<<std::endl);    
     this->bbUserDelete();
   }
@@ -149,13 +149,13 @@ namespace bbtk
   /// Returns true if the UserBlackBox has an input of name name
   bool BlackBox::bbHasInput(const std::string& name) const
   {
-    bbtkDebugMessageInc("Core",8,
+    bbtkDebugMessageInc("Kernel",8,
 			"BlackBox::bbHasInput(\""
 			<<name<<"\") ["<<bbGetFullName()<<"]"
 			<<std::endl);
     bool r = ( bbGetDescriptor()->GetInputDescriptorMap().find(name)
 	       != bbGetDescriptor()->GetInputDescriptorMap().end());
-    bbtkDebugDecTab("Core",8);
+    bbtkDebugDecTab("Kernel",8);
     return r;
   }
   //=========================================================================
@@ -165,11 +165,11 @@ namespace bbtk
   /// Returns true if the UserBlackBox has an output of name name
   bool BlackBox::bbHasOutput(const std::string& name) const
   {
-    bbtkDebugMessageInc("Core",8,"BlackBox::bbHasOutput(\""
+    bbtkDebugMessageInc("Kernel",8,"BlackBox::bbHasOutput(\""
 			<<name<<"\") ["<<bbGetFullName()<<"]"<<std::endl);
     bool r = ( bbGetDescriptor()->GetOutputDescriptorMap().find(name)
 	       != bbGetDescriptor()->GetOutputDescriptorMap().end());
-    bbtkDebugDecTab("Core",8);
+    bbtkDebugDecTab("Kernel",8);
     return r;
   }
   //=========================================================================
@@ -179,11 +179,11 @@ namespace bbtk
   ///  Gets the output type of a given name
   TypeInfo BlackBox::bbGetOutputType( const std::string &name ) const 
   {
-    bbtkDebugMessageInc("Core",8,
+    bbtkDebugMessageInc("Kernel",8,
 			"BlackBox::bbGetOutputType(\""
 			<<name<<"\") ["<<bbGetFullName()<<"]"<<std::endl);
     TypeInfo r = bbGetDescriptor()->GetOutputDescriptor(name)->GetTypeInfo();
-    bbtkDebugDecTab("Core",8); 
+    bbtkDebugDecTab("Kernel",8); 
     return r;
   }
   //=========================================================================
@@ -192,11 +192,11 @@ namespace bbtk
   ///  Gets the input type of a given name
   TypeInfo BlackBox::bbGetInputType( const std::string &name ) const
   {
-    bbtkDebugMessageInc("Core",8,
+    bbtkDebugMessageInc("Kernel",8,
 			"BlackBox::bbGetInputType(\""
 			<<name<<"\") ["<<bbGetFullName()<<"]"<<std::endl);
     TypeInfo r = bbGetDescriptor()->GetInputDescriptor(name)->GetTypeInfo();
-    bbtkDebugDecTab("Core",8);
+    bbtkDebugDecTab("Kernel",8);
     return r;
   }
   //=========================================================================
@@ -206,7 +206,7 @@ namespace bbtk
   /// Allocates the i/o connectors of the black box
   void BlackBox::bbAllocateConnectors()
   {  
-    bbtkDebugMessageInc("Core",8,
+    bbtkDebugMessageInc("Kernel",8,
 			"BlackBox::bbAllocateConnectors() ["
 			<<bbGetFullName()<<"]"
 			<<std::endl);					
@@ -215,7 +215,7 @@ namespace bbtk
     BlackBoxDescriptor::InputDescriptorMapType::const_iterator i;	
     for ( i = imap.begin(); i != imap.end(); ++i )			
       {									
-	bbtkDebugMessage("Core",8,"* Allocate \""<<i->first<<"\""<<std::endl);
+	bbtkDebugMessage("Kernel",8,"* Allocate \""<<i->first<<"\""<<std::endl);
 	bbGetInputConnectorMap()[i->second->GetName()] 
 	  = new BlackBoxInputConnector(this);
       }									
@@ -224,11 +224,11 @@ namespace bbtk
     BlackBoxDescriptor::OutputDescriptorMapType::const_iterator o; 
     for ( o = omap.begin(); o != omap.end(); ++o )
       {							
-	bbtkDebugMessage("Core",8,"* Allocate \""<<o->first<<"\""<<std::endl);
+	bbtkDebugMessage("Kernel",8,"* Allocate \""<<o->first<<"\""<<std::endl);
 	bbGetOutputConnectorMap()[o->second->GetName()] 
 	  = new BlackBoxOutputConnector();
       }
-    bbtkDebugDecTab("Core",8);  
+    bbtkDebugDecTab("Kernel",8);  
   }
   //=========================================================================
 
@@ -237,7 +237,7 @@ namespace bbtk
   /// Desallocates the i/o connectors of the black box
   void BlackBox::bbDesallocateConnectors()
   {
-    bbtkDebugMessageInc("Core",8,
+    bbtkDebugMessageInc("Kernel",8,
 			"BlackBox::bbDesallocateConnectors()"
 			<<std::endl);					
 
@@ -245,18 +245,18 @@ namespace bbtk
     for ( i = bbGetInputConnectorMap().begin();
 	  i != bbGetInputConnectorMap().end(); ++i )		       
       {									
-	bbtkDebugMessage("Core",8,"* Delete \""<<i->first<<"\""<<std::endl);
+	bbtkDebugMessage("Kernel",8,"* Delete \""<<i->first<<"\""<<std::endl);
 	delete (i->second);
       }									
     OutputConnectorMapType::const_iterator o;	
     for ( o = bbGetOutputConnectorMap().begin(); 
 	  o != bbGetOutputConnectorMap().end(); ++o )			
       {									
-	bbtkDebugMessage("Core",8,"* Delete \""<<o->first<<"\""<<std::endl);	       
+	bbtkDebugMessage("Kernel",8,"* Delete \""<<o->first<<"\""<<std::endl);	       
 	delete (o->second);
       }									
    
-    bbtkDebugDecTab("Core",8);  
+    bbtkDebugDecTab("Kernel",8);  
 
   }
   //=========================================================================
@@ -266,7 +266,7 @@ namespace bbtk
   /// Copies the input / output values from another box
   void BlackBox::bbCopyIOValues(BlackBox& from)
   {
-    bbtkDebugMessageInc("Core",9,
+    bbtkDebugMessageInc("Kernel",9,
     			"BlackBox::bbCopyIOValues("
 			<<from.bbGetFullName()<<") ["
 			<<bbGetFullName()<<"]"<<std::endl);
@@ -291,7 +291,7 @@ namespace bbtk
 	this->bbSetOutput(output, from.bbGetOutput(output) );
       }
 
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
 
   }
   //=========================================================================
@@ -551,7 +551,7 @@ namespace bbtk
   /// Connects the input <name> to the connection c
   void BlackBox::bbConnectInput( const std::string& name, Connection* c)
   {
-    bbtkDebugMessageInc("Core",7,
+    bbtkDebugMessageInc("Kernel",7,
 			"BlackBox::bbConnectInput(\""<<name<<"\","<<c<<") ["
 			<<bbGetFullName()<<"]"
 			<<std::endl);       
@@ -564,7 +564,7 @@ namespace bbtk
     
     //  bbSetModifiedStatus();
 
-    bbtkDebugDecTab("Core",7);
+    bbtkDebugDecTab("Kernel",7);
   }
   //=========================================================================
 
@@ -573,7 +573,7 @@ namespace bbtk
   /// Connects the output <name> to the connection c
   void BlackBox::bbConnectOutput( const std::string& name, Connection* c)
   {
-    bbtkDebugMessageInc("Core",7,
+    bbtkDebugMessageInc("Kernel",7,
 			"BlackBox::bbConnectOutput(\""<<name<<"\","<<c<<") ["
 			<<bbGetFullName()<<"]"<<std::endl);       
 
@@ -584,7 +584,7 @@ namespace bbtk
       }
     i->second->SetConnection(c);
 
-    bbtkDebugDecTab("Core",7);
+    bbtkDebugDecTab("Kernel",7);
   }
   //=========================================================================
 
@@ -593,7 +593,7 @@ namespace bbtk
   /// Disconnects the input <name> from the connection c
   void BlackBox::bbDisconnectInput( const std::string& name, Connection* c)
   {
-    bbtkDebugMessageInc("Core",7,
+    bbtkDebugMessageInc("Kernel",7,
 			"BlackBox::bbDisconnectInput(\""<<name
 			<<"\","<<c<<") ["
 			<<bbGetFullName()<<"]"
@@ -606,7 +606,7 @@ namespace bbtk
       }
     i->second->UnsetConnection(c);
 
-    bbtkDebugDecTab("Core",7);
+    bbtkDebugDecTab("Kernel",7);
   }
   //=========================================================================
 
@@ -615,7 +615,7 @@ namespace bbtk
   /// Disconnects the output <name> from the connection c
   void BlackBox::bbDisconnectOutput( const std::string& name, Connection* c)
   {
-    bbtkDebugMessageInc("Core",7,
+    bbtkDebugMessageInc("Kernel",7,
 			"BlackBox::bbDisconnectOutput(\""<<name
 			<<"\","<<c<<") ["
 			<<bbGetFullName()<<"]"
@@ -628,7 +628,7 @@ namespace bbtk
       }
     i->second->UnsetConnection(c);
 
-    bbtkDebugDecTab("Core",7);
+    bbtkDebugDecTab("Kernel",7);
   } 
   //=========================================================================
  
diff --git a/kernel/src/bbtkBlackBoxDescriptor.cxx b/kernel/src/bbtkBlackBoxDescriptor.cxx
index be29eb4..d6d3a40 100644
--- a/kernel/src/bbtkBlackBoxDescriptor.cxx
+++ b/kernel/src/bbtkBlackBoxDescriptor.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkBlackBoxDescriptor.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/02/05 12:16:55 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2008/02/05 13:23:46 $
+  Version:   $Revision: 1.7 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -38,7 +38,7 @@ namespace bbtk
       mKind(STANDARD),
       mPackage(NULL)
   {
-    bbtkDebugMessage("Core",9,
+    bbtkDebugMessage("Kernel",9,
 		     "BlackBoxDescriptor::BlackBoxDescriptor()"<<std::endl);
   }
   //=========================================================================
@@ -47,7 +47,7 @@ namespace bbtk
   /// Dtor
   BlackBoxDescriptor::~BlackBoxDescriptor()
   {
-    bbtkDebugMessageInc("Core",9,
+    bbtkDebugMessageInc("Kernel",9,
 			"BlackBoxDescriptor::~BlackBoxDescriptor() ["
 			<<mTypeName<<"]"<<std::endl);
 
@@ -57,7 +57,7 @@ namespace bbtk
     OutputDescriptorMapType::iterator o;
     for (o=mOutput.begin(); o!=mOutput.end(); ++o) delete o->second;
 
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
   }
   //=========================================================================
 
@@ -65,7 +65,7 @@ namespace bbtk
   /// Adds the string to the BlackBox description
   void BlackBoxDescriptor::AddToDescription( const std::string& s, bool clear)
   {
-    bbtkDebugMessage("Core",9,"BlackBoxDescriptor::AddToDescription(\""<<s<<
+    bbtkDebugMessage("Kernel",9,"BlackBoxDescriptor::AddToDescription(\""<<s<<
 		     "\") ["<<GetTypeName()<<"]"<<std::endl);
     if (clear) mDescription = s; 
     else mDescription += s;
@@ -76,7 +76,7 @@ namespace bbtk
   /// Adds the string to the BlackBox author list
   void BlackBoxDescriptor::AddToAuthor( const std::string& s, bool clear)
   {
-    bbtkDebugMessage("Core",9,"BlackBoxDescriptor::AddToAuthor(\""<<s<<"\") ["
+    bbtkDebugMessage("Kernel",9,"BlackBoxDescriptor::AddToAuthor(\""<<s<<"\") ["
 		     <<GetTypeName()<<"]"<<std::endl);
     if (clear) mAuthor = s;
     else mAuthor += s;
@@ -87,7 +87,7 @@ namespace bbtk
   /// Adds the string to the BlackBox category list
   void BlackBoxDescriptor::AddToCategory( const std::string& s, bool clear)
   {
-    bbtkDebugMessage("Core",9,"BlackBoxDescriptor::AddToCategory(\""<<s<<"\") ["
+    bbtkDebugMessage("Kernel",9,"BlackBoxDescriptor::AddToCategory(\""<<s<<"\") ["
 		     <<GetTypeName()<<"]"<<std::endl);  
     if (clear) mCategory = s;
     else mCategory += s;
@@ -99,7 +99,7 @@ namespace bbtk
   const BlackBoxDescriptor::InputDescriptor* 
   BlackBoxDescriptor::GetInputDescriptor(const std::string & name) const
   {
-    bbtkDebugMessageInc("Core",9,"BlackBoxDescriptor::GetInputDescriptor('"
+    bbtkDebugMessageInc("Kernel",9,"BlackBoxDescriptor::GetInputDescriptor('"
 			<<name<<"') ["<<GetTypeName()<<"]"<<std::endl);
 
     InputDescriptorMapType::const_iterator i;
@@ -108,7 +108,7 @@ namespace bbtk
     {
 	    bbtkError("input '"<<name<<"' does not exist");
     }
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
     return i->second;
   }
   //=========================================================================
@@ -117,7 +117,7 @@ namespace bbtk
   const BlackBoxDescriptor::OutputDescriptor* 
   BlackBoxDescriptor::GetOutputDescriptor(const std::string & name) const
   {
-    bbtkDebugMessageInc("Core",9,"BlackBoxDescriptor::GetOutputDescriptor('"
+    bbtkDebugMessageInc("Kernel",9,"BlackBoxDescriptor::GetOutputDescriptor('"
 			<<name<<"') ["<<GetTypeName()<<"]"<<std::endl);
 
     OutputDescriptorMapType::const_iterator i;
@@ -126,7 +126,7 @@ namespace bbtk
     {
 	    bbtkError("output '"<<name<<"' does not exist");
     }
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
     return i->second;
   }
   //=========================================================================
@@ -134,7 +134,7 @@ namespace bbtk
   //=========================================================================
   void BlackBoxDescriptor::GetHelp(bool full) const
   {
-    bbtkDebugMessageInc("Core",9,"BlackBoxDescriptor::GetHelp() ["<<GetTypeName()<<"]"<<std::endl);
+    bbtkDebugMessageInc("Kernel",9,"BlackBoxDescriptor::GetHelp() ["<<GetTypeName()<<"]"<<std::endl);
     if (GetPackage()) 
 	 {
        bbtkMessage("Help",1,"Black Box <"<<
@@ -201,7 +201,7 @@ namespace bbtk
 		    <<" : "<<o->second->GetDescription()<<std::endl);
       }
    
-     bbtkDebugDecTab("Core",9);
+     bbtkDebugDecTab("Kernel",9);
   
 
   }
@@ -213,7 +213,7 @@ namespace bbtk
 					    const std::string& output_dir,
 					    bool relative_link )
   {
-    bbtkDebugMessageInc("Core",9,"BlackBoxDescriptor::InsertHtmlHelp() ["<<GetTypeName()<<"]"<<std::endl);
+    bbtkDebugMessageInc("Kernel",9,"BlackBoxDescriptor::InsertHtmlHelp() ["<<GetTypeName()<<"]"<<std::endl);
     
     //-------------
     // General info 
@@ -318,7 +318,7 @@ namespace bbtk
     //------------
     // End
 
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
    }
   //=========================================================================
  
diff --git a/kernel/src/bbtkBlackBoxInputConnector.cxx b/kernel/src/bbtkBlackBoxInputConnector.cxx
index 4129a71..9269ec1 100644
--- a/kernel/src/bbtkBlackBoxInputConnector.cxx
+++ b/kernel/src/bbtkBlackBoxInputConnector.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkBlackBoxInputConnector.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/01/22 15:02:00 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/02/05 13:23:46 $
+  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
@@ -28,26 +28,26 @@ namespace bbtk
   BlackBoxInputConnector::BlackBoxInputConnector(BlackBox* b)  
     : mBox(b), mConnection(0), mStatus(MODIFIED)
   {
-    bbtkDebugMessage("Core",9,"BlackBoxInputConnector::BlackBoxInputConnector()"<<std::endl);
+    bbtkDebugMessage("Kernel",9,"BlackBoxInputConnector::BlackBoxInputConnector()"<<std::endl);
   }
 
 
   BlackBoxInputConnector::~BlackBoxInputConnector() 
   {
-    bbtkDebugMessageInc("Core",9,"BlackBoxInputConnector::~BlackBoxInputConnector()"<<std::endl);
+    bbtkDebugMessageInc("Kernel",9,"BlackBoxInputConnector::~BlackBoxInputConnector()"<<std::endl);
     if (mConnection) delete mConnection;
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
   }
   
   void BlackBoxInputConnector::SetConnection(Connection* c) 
   { 
-    bbtkDebugMessage("Core",9,"BlackBoxInputConnector::SetConnection("<<c<<")"<<std::endl);
+    bbtkDebugMessage("Kernel",9,"BlackBoxInputConnector::SetConnection("<<c<<")"<<std::endl);
     mConnection = c; 
   }
   
   void BlackBoxInputConnector::UnsetConnection(Connection* c) 
   { 
-    bbtkDebugMessage("Core",9,"BlackBoxInputConnector::UnsetConnection("
+    bbtkDebugMessage("Kernel",9,"BlackBoxInputConnector::UnsetConnection("
 		     <<c<<")"<<std::endl);
     mConnection = 0; 
   }
diff --git a/kernel/src/bbtkBlackBoxOutputConnector.cxx b/kernel/src/bbtkBlackBoxOutputConnector.cxx
index 70352ff..7535b35 100644
--- a/kernel/src/bbtkBlackBoxOutputConnector.cxx
+++ b/kernel/src/bbtkBlackBoxOutputConnector.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkBlackBoxOutputConnector.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/01/22 15:02:00 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/02/05 13:23:46 $
+  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
@@ -32,12 +32,12 @@ namespace bbtk
   BlackBoxOutputConnector::BlackBoxOutputConnector() 
   // : mStatus(MODIFIED)
   {
-    bbtkDebugMessage("Core",9,"BlackBoxOutputConnector::BlackBoxOutputConnector()"<<std::endl);
+    bbtkDebugMessage("Kernel",9,"BlackBoxOutputConnector::BlackBoxOutputConnector()"<<std::endl);
   }
 
   BlackBoxOutputConnector::~BlackBoxOutputConnector() 
   {
-    bbtkDebugMessageInc("Core",9,
+    bbtkDebugMessageInc("Kernel",9,
 			"BlackBoxOutputConnector::~BlackBoxOutputConnector()"
 			<<std::endl);
     std::vector<Connection*>::iterator i;
@@ -45,13 +45,13 @@ namespace bbtk
       {
 	delete *i;
       }
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
   }
 
   ///
   void BlackBoxOutputConnector::SetConnection(Connection* c)
   {
-    bbtkDebugMessage("Core",9,"BlackBoxOutputConnector::SetConnection("
+    bbtkDebugMessage("Kernel",9,"BlackBoxOutputConnector::SetConnection("
 		     <<c<<")"<<std::endl);
     mConnection.push_back(c);
   }
@@ -61,7 +61,7 @@ namespace bbtk
   ///
   void BlackBoxOutputConnector::UnsetConnection(Connection* c)
   {
-    bbtkDebugMessageInc("Core",9,"BlackBoxOutputConnector::UnsetConnection("
+    bbtkDebugMessageInc("Kernel",9,"BlackBoxOutputConnector::UnsetConnection("
 		     <<c<<")"<<std::endl);
 
     std::vector<Connection*>::iterator i;
@@ -76,7 +76,7 @@ namespace bbtk
       }
     mConnection.erase(i);
 
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
   }
 
 
diff --git a/kernel/src/bbtkComplexBlackBox.cxx b/kernel/src/bbtkComplexBlackBox.cxx
index 2c09e31..ec6f1c3 100644
--- a/kernel/src/bbtkComplexBlackBox.cxx
+++ b/kernel/src/bbtkComplexBlackBox.cxx
@@ -3,8 +3,8 @@
 Program:   bbtk
 Module:    $RCSfile: bbtkComplexBlackBox.cxx,v $
 Language:  C++
-Date:      $Date: 2008/01/22 15:02:00 $
-Version:   $Revision: 1.1 $
+Date:      $Date: 2008/02/05 13:23:46 $
+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
@@ -37,11 +37,11 @@ namespace bbtk
     : BlackBox(name),
       mDescriptor(desc)
   {
-    bbtkDebugMessageInc("Core",9,
+    bbtkDebugMessageInc("Kernel",9,
     			"ComplexBlackBox::ComplexBlackBox(\""
 			<<name<<"\")"<<std::endl);
     bbAllocateConnectors();
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
   }
   //=======================================================================
 
@@ -53,28 +53,28 @@ namespace bbtk
       mDescriptor(from.mDescriptor),
      mExecutionList(from.mExecutionList)    
   {
-    bbtkDebugMessageInc("Core",9,
+    bbtkDebugMessageInc("Kernel",9,
     			"ComplexBlackBox::ComplexBlackBox(\""
 			<<from.bbGetName()<<"\",\""
 			<<name<<"\")"<<std::endl);
 
-    bbtkDebugMessageInc("Core",9,"* Cloning Black Boxes"<<std::endl);
+    bbtkDebugMessageInc("Kernel",9,"* Cloning Black Boxes"<<std::endl);
     BlackBoxMapType::const_iterator i;
     for ( i = from.mBlackBoxMap.begin(); i != from.mBlackBoxMap.end(); ++i ) 
       {
-	bbtkDebugMessageInc("Core",9,"* Cloning \""<<i->first<<"\""<<std::endl);
+	bbtkDebugMessageInc("Kernel",9,"* Cloning \""<<i->first<<"\""<<std::endl);
 	BlackBox* B = i->second->bbClone(i->second->bbGetName());
 	bbUnsafeAddBlackBox(B);
 	
-	bbtkDebugDecTab("Core",9);
+	bbtkDebugDecTab("Kernel",9);
       }
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
    
-    bbtkDebugMessageInc("Core",9,"* Cloning Connections"<<std::endl);
+    bbtkDebugMessageInc("Kernel",9,"* Cloning Connections"<<std::endl);
     ConnectionListType::const_iterator j;
     for ( j = from.mConnectionList.begin(); j != from.mConnectionList.end(); ++j ) 
       {
-	bbtkDebugMessageInc("Core",9,"* Cloning \""<<
+	bbtkDebugMessageInc("Kernel",9,"* Cloning \""<<
 			    (*j)->GetFullName()<<"\""<<std::endl);
 
 	BlackBox* bbfrom = bbGetBlackBox( (*j)->GetBlackBoxFrom()->bbGetName() );
@@ -87,12 +87,12 @@ namespace bbtk
 	
 	bbAddConnection(c);
 
-	bbtkDebugDecTab("Core",9);
+	bbtkDebugDecTab("Kernel",9);
       }
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
 
     bbAllocateConnectors();
-    bbtkDebugDecTab("Core",9);    
+    bbtkDebugDecTab("Kernel",9);    
   }
   //=======================================================================
 
@@ -100,37 +100,37 @@ namespace bbtk
   ///  Destructor
   ComplexBlackBox::~ComplexBlackBox()
   {
-    bbtkDebugMessageInc("Core",9,
+    bbtkDebugMessageInc("Kernel",9,
 			"ComplexBlackBox::~ComplexBlackBox() ["
 			<<bbGetFullName()<<"]"<<std::endl);
     
-    bbtkDebugMessageInc("Core",9,"* Delete Connections"<<std::endl);
+    bbtkDebugMessageInc("Kernel",9,"* Delete Connections"<<std::endl);
     ConnectionListType::iterator j;
     for ( j = mConnectionList.begin(); j != mConnectionList.end(); ++j ) 
       {
-	bbtkDebugMessageInc("Core",9,"* Delete \""<<
+	bbtkDebugMessageInc("Kernel",9,"* Delete \""<<
 			    (*j)->GetFullName()<<"\""<<std::endl);
 	delete *j;
-	bbtkDebugDecTab("Core",9);
+	bbtkDebugDecTab("Kernel",9);
       }
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
 
     
-    bbtkDebugMessageInc("Core",9,"* Delete Black Boxes"<<std::endl);
+    bbtkDebugMessageInc("Kernel",9,"* Delete Black Boxes"<<std::endl);
     BlackBoxMapType::iterator i;
     for ( i = mBlackBoxMap.begin(); i != mBlackBoxMap.end(); ++i ) 
       {
-	bbtkDebugMessageInc("Core",9,"* Delete \""<<i->first<<"\""<<std::endl);
+	bbtkDebugMessageInc("Kernel",9,"* Delete \""<<i->first<<"\""<<std::endl);
 	i->second->bbDelete();
-	bbtkDebugDecTab("Core",9);
+	bbtkDebugDecTab("Kernel",9);
       }
-    bbtkDebugDecTab("Core",9);
-    //    bbtkDebugMessage("Core",9,"EO ComplexBlackBox::~ComplexBlackBox  ["
+    bbtkDebugDecTab("Kernel",9);
+    //    bbtkDebugMessage("Kernel",9,"EO ComplexBlackBox::~ComplexBlackBox  ["
     //		     <<bbGetFullName()<<"]"<<std::endl);
 
     
     this->bbDesallocateConnectors();
-    bbtkDebugDecTab("Core",9);   
+    bbtkDebugDecTab("Kernel",9);   
   } 
   //=======================================================================
 
@@ -138,7 +138,7 @@ namespace bbtk
   /// Allocates the i/o connectors of the black box
   void ComplexBlackBox::bbAllocateConnectors()
   {  
-    bbtkDebugMessageInc("Core",8,
+    bbtkDebugMessageInc("Kernel",8,
 			"ComplexBlackBox::bbAllocateConnectors() ["
 			<<bbGetFullName()<<"]"
 			<<std::endl);	
@@ -149,7 +149,7 @@ namespace bbtk
     BlackBoxDescriptor::InputDescriptorMapType::const_iterator i;	
     for ( i = imap.begin(); i != imap.end(); ++i )			
       {									
-	bbtkDebugMessage("Core",8,"* Allocate \""<<i->first<<"\""<<std::endl);
+	bbtkDebugMessage("Kernel",8,"* Allocate \""<<i->first<<"\""<<std::endl);
 	// Redirect the connector to the internal box connector
 	// Cast the BBInputDescriptor into a ComplexBBInputDescriptor
 	ComplexBlackBoxInputDescriptor* d = 
@@ -169,7 +169,7 @@ namespace bbtk
     BlackBoxDescriptor::OutputDescriptorMapType::const_iterator o; 
     for ( o = omap.begin(); o != omap.end(); ++o )
       {							
-	bbtkDebugMessage("Core",8,"* Allocate \""<<o->first<<"\""<<std::endl);
+	bbtkDebugMessage("Kernel",8,"* Allocate \""<<o->first<<"\""<<std::endl);
 	// Redirect the connector to the internal box connector
 	// Cast the BBOutputDescriptor into a ComplexBBOutputDescriptor
 	ComplexBlackBoxOutputDescriptor* d = 
@@ -182,7 +182,7 @@ namespace bbtk
 	bbGetOutputConnectorMap()[o->second->GetName()] = c;
 	//new BlackBoxOutputConnector();
       }
-    bbtkDebugDecTab("Core",8);  
+    bbtkDebugDecTab("Kernel",8);  
   }
   //=========================================================================
 
@@ -191,7 +191,7 @@ namespace bbtk
   /// Desallocates the i/o connectors of the black box
   void ComplexBlackBox::bbDesallocateConnectors()
   {
-    bbtkDebugMessageInc("Core",8,
+    bbtkDebugMessageInc("Kernel",8,
 			"ComplexBlackBox::DesallocateConnectors()"
 			<<std::endl);					
 
@@ -202,7 +202,7 @@ namespace bbtk
     bbGetInputConnectorMap().clear();
     bbGetOutputConnectorMap().clear();
 
-    bbtkDebugDecTab("Core",8);  
+    bbtkDebugDecTab("Kernel",8);  
 
   }
   //=========================================================================
@@ -210,13 +210,13 @@ namespace bbtk
   //=======================================================================
   BlackBox* ComplexBlackBox::bbClone(const std::string& name)
   {
-    bbtkDebugMessageInc("Core",9,
+    bbtkDebugMessageInc("Kernel",9,
 			"ComplexBlackBox::bbClone(\""<<name<<"\") ["
 			<<bbGetFullName()<<"]"<<std::endl);
     
     ComplexBlackBox* CBB = new ComplexBlackBox(*this,name);
     
-    bbtkDebugDecTab("Core",9);   
+    bbtkDebugDecTab("Kernel",9);   
 
     return CBB;
   }
@@ -279,14 +279,14 @@ namespace bbtk
   //==================================================================
   void ComplexBlackBox::bbAddToExecutionList( const std::string& name )
   {
-        bbtkDebugMessageInc("Core",9,
+        bbtkDebugMessageInc("Kernel",9,
 			"ComplexBlackBox::bbAddToExecutionList(\""
 	                <<name<<"\") ["
 			<<bbGetFullName()<<"]"<<std::endl);
 
 	mExecutionList.push_back( name );
 
-     bbtkDebugDecTab("Core",9);   
+     bbtkDebugDecTab("Kernel",9);   
 
   }
   //==================================================================
@@ -461,7 +461,7 @@ namespace bbtk
   /// Adds the black box to the complex box
   void ComplexBlackBox::bbAddBlackBox( BlackBox* b)
   {
-    bbtkDebugMessageInc("Core",7,
+    bbtkDebugMessageInc("Kernel",7,
 			"ComplexBlackBox::AddBlackBox(\""<<b->bbGetName()
 			<<"\") ["
 			<<bbGetFullName()<<"]"<<std::endl);  
@@ -474,7 +474,7 @@ namespace bbtk
     b->bbSetParent(this);
     mBlackBoxMap[b->bbGetName()] = b;
 
-    bbtkDebugDecTab("Core",7);
+    bbtkDebugDecTab("Kernel",7);
   }
   //==================================================================
 
@@ -482,7 +482,7 @@ namespace bbtk
   /// Adds the black box to the complex box (unsafe)
   void ComplexBlackBox::bbUnsafeAddBlackBox( BlackBox* b)
   {
-    bbtkDebugMessageInc("Core",7,
+    bbtkDebugMessageInc("Kernel",7,
 			"ComplexBlackBox::UnsafeAddBlackBox(\""<<b->bbGetName()
 			<<"\") ["
 			<<bbGetFullName()<<"]"<<std::endl);  
@@ -490,7 +490,7 @@ namespace bbtk
     b->bbSetParent(this);
     mBlackBoxMap[b->bbGetName()] = b;
 
-    bbtkDebugDecTab("Core",7);
+    bbtkDebugDecTab("Kernel",7);
   }
   //==================================================================
 
@@ -498,13 +498,13 @@ namespace bbtk
   /// Removes the black box from the complex box
   void ComplexBlackBox::bbRemoveBlackBox( const std::string& name )
   {
-    bbtkDebugMessageInc("Core",7,
+    bbtkDebugMessageInc("Kernel",7,
 			"ComplexBlackBox::RemoveBlackBox(\""<<name<<"\") ["
 			<<bbGetFullName()<<"]"<<std::endl);  
 
     bbtkError("ComplexBlackBox::RemoveBlackBox not implemented");
 
-    bbtkDebugDecTab("Core",7);
+    bbtkDebugDecTab("Kernel",7);
   }
   //==================================================================
 
@@ -512,13 +512,13 @@ namespace bbtk
   /// Adds the connection to the complex box
   void ComplexBlackBox::bbAddConnection( Connection* c)
   {
-    bbtkDebugMessageInc("Core",7,
+    bbtkDebugMessageInc("Kernel",7,
 			"ComplexBlackBox::AddConnection(\""<<"..."<<"\") ["
 			<<bbGetFullName()<<"]"<<std::endl);  
 
     mConnectionList.push_back(c);
 
-    bbtkDebugDecTab("Core",7);
+    bbtkDebugDecTab("Kernel",7);
   }
   //==================================================================
   //    void RemoveConnection( );
@@ -527,7 +527,7 @@ namespace bbtk
   /// Returns the black box with name <name>
   BlackBox* ComplexBlackBox::bbGetBlackBox( const std::string& name )
   {
-    bbtkDebugMessageInc("Core",9,
+    bbtkDebugMessageInc("Kernel",9,
 			"ComplexBlackBox::GetBlackBox(\""<<name<<"\") ["
 			<<bbGetFullName()<<"]"<<std::endl);  
 
@@ -537,7 +537,7 @@ namespace bbtk
 	bbtkError("the black box \""<<name<<"\" does not exist");
       }
 
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
     return i->second;
   }
   //==================================================================
@@ -547,7 +547,7 @@ namespace bbtk
   /// if it does not exist but return a null pointer
   BlackBox* ComplexBlackBox::bbUnsafeGetBlackBox( const std::string& name )
   {
-    bbtkDebugMessageInc("Core",9,
+    bbtkDebugMessageInc("Kernel",9,
 			"ComplexBlackBox::UnsafeGetBlackBox(\""<<name<<"\") ["
 			<<bbGetFullName()<<"]"
 			<<std::endl);  
@@ -555,11 +555,11 @@ namespace bbtk
     BlackBoxMapType::iterator i = mBlackBoxMap.find(name);
     if ( i == mBlackBoxMap.end() ) 
       {
-	bbtkDebugDecTab("Core",9);
+	bbtkDebugDecTab("Kernel",9);
 	return 0;
       }
 
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
     return i->second;
     
   }
@@ -568,7 +568,7 @@ namespace bbtk
   //==================================================================
   void ComplexBlackBox::bbPrintBlackBoxes()
   {
-    bbtkDebugMessageInc("Core",9,
+    bbtkDebugMessageInc("Kernel",9,
 			"ComplexBlackBox::PrintBlackBoxes() ["
 			<<bbGetFullName()<<"]"
 			<<std::endl);  
@@ -579,7 +579,7 @@ namespace bbtk
 	bbtkMessage("Help",1,i->second->bbGetFullName()<<std::endl);
       }
 
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
   }
   //==================================================================
 
diff --git a/kernel/src/bbtkComplexBlackBoxDescriptor.cxx b/kernel/src/bbtkComplexBlackBoxDescriptor.cxx
index ea85e12..f6f6f4b 100644
--- a/kernel/src/bbtkComplexBlackBoxDescriptor.cxx
+++ b/kernel/src/bbtkComplexBlackBoxDescriptor.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkComplexBlackBoxDescriptor.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/02/05 12:16:55 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2008/02/05 13:23:46 $
+  Version:   $Revision: 1.4 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -35,10 +35,10 @@ namespace bbtk
   ComplexBlackBoxDescriptor::ComplexBlackBoxDescriptor(const std::string& name)
     : BlackBoxDescriptor()
   {
-    bbtkDebugMessageInc("Core",9,"ComplexBlackBoxDescriptor::ComplexBlackBoxDescriptor(\""<<name<<"\")"<<std::endl);
+    bbtkDebugMessageInc("Kernel",9,"ComplexBlackBoxDescriptor::ComplexBlackBoxDescriptor(\""<<name<<"\")"<<std::endl);
     SetTypeName(name);
     mPrototype = new ComplexBlackBox(name+std::string("Prototype"),this);
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
   }
   //=======================================================================
 
@@ -48,11 +48,11 @@ namespace bbtk
   /// Default dtor
   ComplexBlackBoxDescriptor::~ComplexBlackBoxDescriptor()
   {
-    bbtkDebugMessageInc("Core",9,"ComplexBlackBoxDescriptor::~ComplexBlackBoxDescriptor(\""<<GetTypeName()<<"\")"<<std::endl);
+    bbtkDebugMessageInc("Kernel",9,"ComplexBlackBoxDescriptor::~ComplexBlackBoxDescriptor(\""<<GetTypeName()<<"\")"<<std::endl);
 
     delete mPrototype;
 
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
   }
   //=======================================================================
 
@@ -62,14 +62,14 @@ namespace bbtk
   BlackBox* ComplexBlackBoxDescriptor::CreateInstance(const std::string& name)
   {
     //bbtkError("ComplexBlackBoxDescriptor::CreateInstance not implemented");
-    bbtkDebugMessageInc("Core",5,
+    bbtkDebugMessageInc("Kernel",5,
 			"ComplexBlackBoxDescriptor::CreateInstance(\""
 			<<name<<"\") ["
 			<<GetTypeName()<<"]"<<std::endl);
     
     return mPrototype->bbClone(name);
 
-    bbtkDebugDecTab("Core",5);
+    bbtkDebugDecTab("Kernel",5);
   }
   //=======================================================================
 
@@ -81,7 +81,7 @@ namespace bbtk
 					const std::string& name
 					)
   {
-    bbtkDebugMessageInc("Core",5,
+    bbtkDebugMessageInc("Kernel",5,
 			"ComplexBlackBoxDescriptor::Add(\""
 			<<type<<"\",\""<<name<<"\") ["
 			<<GetTypeName()<<"]"<<std::endl);
@@ -95,7 +95,7 @@ namespace bbtk
     // ok : create new one
     mPrototype->bbAddBlackBox ( /*mFactory->Create*/ NewBlackBox(type,name) );
 
-    bbtkDebugDecTab("Core",5);
+    bbtkDebugDecTab("Kernel",5);
   }
   //=======================================================================
 
@@ -103,7 +103,7 @@ namespace bbtk
   /// Adds a black box to the execution list 
   void ComplexBlackBoxDescriptor::AddToExecutionList ( const std::string& box)
   {
-    bbtkDebugMessageInc("Core",5,
+    bbtkDebugMessageInc("Kernel",5,
 			"ComplexBlackBoxDescriptor::AddToExecutionList(\""
 			<<box<<"\" ["
 			<<GetTypeName()<<"]"<<std::endl);
@@ -116,7 +116,7 @@ namespace bbtk
     // ok 
     mPrototype->bbAddToExecutionList ( box  );
 
-    bbtkDebugDecTab("Core",5);
+    bbtkDebugDecTab("Kernel",5);
     }
 
 
@@ -128,7 +128,7 @@ namespace bbtk
 					    const std::string& input
 					    )
   {
-    bbtkDebugMessageInc("Core",5,
+    bbtkDebugMessageInc("Kernel",5,
 			"ComplexBlackBoxDescriptor::Connect(\""
 			<<from<<"\",\""<<output<<"\",\""
 			<<to<<"\",\""<<input
@@ -150,7 +150,7 @@ namespace bbtk
 
     mPrototype->bbAddConnection(c);
 
-    bbtkDebugDecTab("Core",5);
+    bbtkDebugDecTab("Kernel",5);
   }
   //=======================================================================
 
@@ -162,7 +162,7 @@ namespace bbtk
 						const std::string& input,
 						const std::string& help)
   {
-    bbtkDebugMessageInc("Core",5,
+    bbtkDebugMessageInc("Kernel",5,
 			"ComplexBlackBoxDescriptor::DefineInput(\""
 			<<name<<"\",\""<<box<<"\",\""
 			<<input<<"\",\""<<help
@@ -188,7 +188,7 @@ namespace bbtk
 							      bb->bbGetInputType(input)));
 							     
     
-    bbtkDebugDecTab("Core",5);
+    bbtkDebugDecTab("Kernel",5);
   }
   //=======================================================================
 
@@ -199,7 +199,7 @@ namespace bbtk
 						 const std::string& output,
 						 const std::string& help)
   {
-    bbtkDebugMessageInc("Core",5,
+    bbtkDebugMessageInc("Kernel",5,
 			"ComplexBlackBoxDescriptor::DefineOutput(\""
 			<<name<<"\",\""<<box<<"\",\""
 			<<output<<"\",\""<<help
@@ -226,7 +226,7 @@ namespace bbtk
 			    bb->bbGetOutputType(output)));
     
     
-    bbtkDebugDecTab("Core",5);
+    bbtkDebugDecTab("Kernel",5);
   }
   //=======================================================================
 
@@ -256,7 +256,7 @@ namespace bbtk
 						   int detail, int level,
 						   const std::string& output_dir, bool relative_link)
   {
-    bbtkDebugMessageInc("Core",9,
+    bbtkDebugMessageInc("Kernel",9,
 			"ComplexBlackBoxDescriptor::InsertHtmlHelp() ["
 			<<GetTypeName()<<"]"<<std::endl);
     
@@ -412,7 +412,7 @@ namespace bbtk
     //------------
     // End
 
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
    }
   //=========================================================================
  
diff --git a/kernel/src/bbtkComplexBlackBoxInputDescriptor.cxx b/kernel/src/bbtkComplexBlackBoxInputDescriptor.cxx
index 29d174b..fcec38b 100644
--- a/kernel/src/bbtkComplexBlackBoxInputDescriptor.cxx
+++ b/kernel/src/bbtkComplexBlackBoxInputDescriptor.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkComplexBlackBoxInputDescriptor.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/01/22 15:02:00 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/02/05 13:23:46 $
+  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
@@ -39,13 +39,13 @@ TypeInfo type)
     mType(type)
   {    
     
-    bbtkDebugMessage("Core",9,"ComplexBlackBoxInputDescriptor::ComplexBlackBoxInputDescriptor(\""<<name<<"\",\""<<description<<"\",\""<<target<<"\",\""<<input<<"\")"<<std::endl);
+    bbtkDebugMessage("Kernel",9,"ComplexBlackBoxInputDescriptor::ComplexBlackBoxInputDescriptor(\""<<name<<"\",\""<<description<<"\",\""<<target<<"\",\""<<input<<"\")"<<std::endl);
   }
   
 
   ComplexBlackBoxInputDescriptor::~ComplexBlackBoxInputDescriptor() 
   {
-    bbtkDebugMessage("Core",9,"ComplexBlackBoxInputDescriptor::~ComplexBlackBoxInputDescriptor(\""<<GetName()<<"\",\""<<GetDescription()<<"\",\""<<GetTarget()<<"\",\""<<GetInput()<<"\")"<<std::endl);
+    bbtkDebugMessage("Kernel",9,"ComplexBlackBoxInputDescriptor::~ComplexBlackBoxInputDescriptor(\""<<GetName()<<"\",\""<<GetDescription()<<"\",\""<<GetTarget()<<"\",\""<<GetInput()<<"\")"<<std::endl);
   }
   
 }
diff --git a/kernel/src/bbtkComplexBlackBoxOutputDescriptor.cxx b/kernel/src/bbtkComplexBlackBoxOutputDescriptor.cxx
index 7b2d71f..8d5c5d8 100644
--- a/kernel/src/bbtkComplexBlackBoxOutputDescriptor.cxx
+++ b/kernel/src/bbtkComplexBlackBoxOutputDescriptor.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkComplexBlackBoxOutputDescriptor.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/01/22 15:02:00 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/02/05 13:23:46 $
+  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
@@ -39,7 +39,7 @@ namespace bbtk
     mType(type)
   {    
     
-    bbtkDebugMessage("Core",9,"ComplexBlackBoxOutputDescriptor::ComplexBlackBoxOutputDescriptor(\""<<name<<"\",\""<<description<<"\",\""<<target<<"\",\""<<output<<"\")"<<std::endl);
+    bbtkDebugMessage("Kernel",9,"ComplexBlackBoxOutputDescriptor::ComplexBlackBoxOutputDescriptor(\""<<name<<"\",\""<<description<<"\",\""<<target<<"\",\""<<output<<"\")"<<std::endl);
   }
   
 
@@ -48,7 +48,7 @@ namespace bbtk
 
   ComplexBlackBoxOutputDescriptor::~ComplexBlackBoxOutputDescriptor() 
   {
-    bbtkDebugMessage("Core",9,"ComplexBlackBoxOutputDescriptor::~ComplexBlackBoxOutputDescriptor(\""<<GetName()<<"\",\""<<GetDescription()<<"\",\""<<GetTarget()<<"\",\""<<GetOutput()<<"\")"<<std::endl);
+    bbtkDebugMessage("Kernel",9,"ComplexBlackBoxOutputDescriptor::~ComplexBlackBoxOutputDescriptor(\""<<GetName()<<"\",\""<<GetDescription()<<"\",\""<<GetTarget()<<"\",\""<<GetOutput()<<"\")"<<std::endl);
   }
   
 }
diff --git a/kernel/src/bbtkConnection.cxx b/kernel/src/bbtkConnection.cxx
index ff8bd77..5049658 100644
--- a/kernel/src/bbtkConnection.cxx
+++ b/kernel/src/bbtkConnection.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkConnection.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/01/22 15:02:00 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/02/05 13:23:46 $
+  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
@@ -37,7 +37,7 @@ namespace bbtk
       mFromAny(false),
       mToAny(false)
   {
-    bbtkDebugMessageInc("Core",7,"Connection::Connection(\""
+    bbtkDebugMessageInc("Kernel",7,"Connection::Connection(\""
 			<<from->bbGetName()<<"\",\""<<output<<"\",\""
 			<<to->bbGetName()<<"\",\""<<input<<"\")"
 			<<std::endl);    
@@ -86,7 +86,7 @@ namespace bbtk
 	  }
 	else if (  to->bbGetInputType(input) == typeid(Data) )
 	  {   
-	    bbtkDebugMessage("Core",8," -> '"<<input<<"' type is "
+	    bbtkDebugMessage("Kernel",8," -> '"<<input<<"' type is "
 			     <<TypeName<Data>()<<" : can receive any data"
 			     <<std::endl);
 	    mToAny = true;
@@ -115,7 +115,7 @@ namespace bbtk
     from->bbConnectOutput(output,this);
     to->bbConnectInput(input,this);
     
-    bbtkDebugDecTab("Core",7);
+    bbtkDebugDecTab("Kernel",7);
   }
 
   //==================================================================
@@ -125,7 +125,7 @@ namespace bbtk
   /// Dtor 
   Connection::~Connection()
   {
-    bbtkDebugMessageInc("Core",7,
+    bbtkDebugMessageInc("Kernel",7,
 			"Connection::~Connection() ["
 			<<GetFullName()<<"]"<<std::endl);
 
@@ -133,7 +133,7 @@ namespace bbtk
     mTo->bbDisconnectInput(mInput,this);
     if (mAdaptor) mAdaptor->bbDelete();
 
-    bbtkDebugDecTab("Core",7);
+    bbtkDebugDecTab("Kernel",7);
   }
   //==================================================================
   
diff --git a/kernel/src/bbtkExecuter.cxx b/kernel/src/bbtkExecuter.cxx
index fe1e36d..8348d06 100644
--- a/kernel/src/bbtkExecuter.cxx
+++ b/kernel/src/bbtkExecuter.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkExecuter.cxx,v $ $
   Language:  C++
-  Date:      $Date: 2008/02/05 12:16:55 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2008/02/05 13:23:46 $
+  Version:   $Revision: 1.7 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -47,9 +47,9 @@ namespace bbtk
   {
     //VirtualExec();
     
-    bbtkDebugMessageInc("Core",9,"Executer::Executer()" <<std::endl);
+    bbtkDebugMessageInc("Kernel",9,"Executer::Executer()" <<std::endl);
     Reset();
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
   } 
 
 /**
@@ -57,7 +57,7 @@ namespace bbtk
  */
   Executer::~Executer()
   {
-     bbtkDebugMessageInc("Core",9,"Executer::~Executer()" <<std::endl);
+     bbtkDebugMessageInc("Kernel",9,"Executer::~Executer()" <<std::endl);
      if (mRoot) 
      {
         mPackage->UnRegisterBlackBox("workspace");
@@ -67,7 +67,7 @@ namespace bbtk
      {
         GetGlobalFactory()->UnLoadPackage("user");
      }
-     bbtkDebugDecTab("Core",9);
+     bbtkDebugDecTab("Kernel",9);
   }
   
 
@@ -76,7 +76,7 @@ namespace bbtk
  */
   void Executer::Reset()
   {
-    bbtkDebugMessageInc("Core",9,"Executer::Reset()" <<std::endl);
+    bbtkDebugMessageInc("Kernel",9,"Executer::Reset()" <<std::endl);
 
     // The 'user' package must be closed before all other 
     // because box destructors must not be unloaded when bb are deleted!
@@ -109,7 +109,7 @@ namespace bbtk
     // Insert the user package in the factory
     InsertPackage(mPackage);
     mOpenPackage.push_back(mPackage);
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
   }
   
   /// changes the workspace name
@@ -120,7 +120,7 @@ namespace bbtk
   
   void Executer::BeginPackage (const std::string &name)
   {
-     bbtkDebugMessageInc("Core",9,"Executer::BeginPackage(\""<<name<<"\")"
+     bbtkDebugMessageInc("Kernel",9,"Executer::BeginPackage(\""<<name<<"\")"
                         <<std::endl);
      Package* p;
      try 
@@ -148,7 +148,7 @@ namespace bbtk
 			 const std::string &pack,
 			 const std::string &scriptfilename)
   {
-    bbtkDebugMessageInc("Core",9,"Executer::Define(\""<<name<<
+    bbtkDebugMessageInc("Kernel",9,"Executer::Define(\""<<name<<
 			","<<pack<<"\")" 
                         <<std::endl);
 
@@ -156,12 +156,12 @@ namespace bbtk
     b->SetScriptFileName(scriptfilename);
     mOpenDefinition.push_back( CBBDefinition( b, pack ) );
     
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
   }
 
   void Executer::EndDefine ()
   {
-    bbtkDebugMessageInc("Core",9,"Executer::EndDefine(\""
+    bbtkDebugMessageInc("Kernel",9,"Executer::EndDefine(\""
                         <<Current()->GetTypeName()<<"\")" 
                         <<std::endl);
     // Does current package exist ?
diff --git a/kernel/src/bbtkFactory.cxx b/kernel/src/bbtkFactory.cxx
index 3e6f772..fc029ff 100644
--- a/kernel/src/bbtkFactory.cxx
+++ b/kernel/src/bbtkFactory.cxx
@@ -4,8 +4,8 @@ Program:   bbtk
 Module:    $RCSfile: bbtkFactory.cxx,v $
 Language:  C++
 
-Date:      $Date: 2008/02/05 12:16:55 $
-Version:   $Revision: 1.13 $
+Date:      $Date: 2008/02/05 13:23:46 $
+Version:   $Revision: 1.14 $
                                                                                 
 
 Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
@@ -62,7 +62,7 @@ namespace bbtk
   /// Default ctor
   Factory::Factory()
   {
-    bbtkDebugMessage("Core",7,"Factory::Factory()"<<std::endl);
+    bbtkDebugMessage("Kernel",7,"Factory::Factory()"<<std::endl);
   }
   //===================================================================
 
@@ -70,9 +70,9 @@ namespace bbtk
   /// Dtor
   Factory::~Factory()
   {
-    bbtkDebugMessageInc("Core",7,"Factory::~Factory()"<<std::endl);
+    bbtkDebugMessageInc("Kernel",7,"Factory::~Factory()"<<std::endl);
     CloseAllPackages();
-    bbtkDebugDecTab("Core",7);
+    bbtkDebugDecTab("Kernel",7);
   }
   //===================================================================
 
@@ -80,22 +80,22 @@ namespace bbtk
   //===================================================================
   void Factory::CloseAllPackages()
   {
-    bbtkDebugMessageInc("Core",7,"Factory::CloseAllPackages()"<<std::endl);
+    bbtkDebugMessageInc("Kernel",7,"Factory::CloseAllPackages()"<<std::endl);
     while (mPackageMap.begin() != mPackageMap.end())
       {
         PackageMapType::iterator i = mPackageMap.begin();
         ClosePackage(i);
       }
-    bbtkDebugDecTab("Core",7);
+    bbtkDebugDecTab("Kernel",7);
   }
   //===================================================================
 
   //===================================================================
   void Factory::Reset()
   {
-    bbtkDebugMessageInc("Core",7,"Factory::Reset()"<<std::endl);
+    bbtkDebugMessageInc("Kernel",7,"Factory::Reset()"<<std::endl);
     CloseAllPackages();
-    bbtkDebugDecTab("Core",7);
+    bbtkDebugDecTab("Kernel",7);
   }
   //===================================================================
 
@@ -244,7 +244,7 @@ namespace bbtk
         bbtkMessage("Output",2,pack.mPackage->GetDescription()<<std::endl);
     //===================================================================
 
-        bbtkDebugDecTab("Core",7);
+        bbtkDebugDecTab("Kernel",7);
         return true;
   }
 
@@ -276,7 +276,7 @@ namespace bbtk
   //
   // lastname : string before the last / (if any), or user supplied name
 
-    bbtkDebugMessageInc("Core",7,"Factory::LoadPackage(\""<<name<<"\")"<<std::endl);
+    bbtkDebugMessageInc("Kernel",7,"Factory::LoadPackage(\""<<name<<"\")"<<std::endl);
     bbtkMessage("Debug",1,"Factory::LoadPackage(\""<<name<<"\")"<<std::endl);
     bbtkMessage("Debug",1,"use_configuration_file ["
                  << use_configuration_file << "]" << std::endl);
@@ -432,7 +432,7 @@ namespace bbtk
   /// If the entry is found in the map, calls ClosePackage
  void Factory::UnLoadPackage( const std::string& name )
  {
-    bbtkDebugMessageInc("Core",7,"Factory::UnLoadPackage(\""
+    bbtkDebugMessageInc("Kernel",7,"Factory::UnLoadPackage(\""
                        <<name<<"\")"<<std::endl);
   
     PackageMapType::iterator i;
@@ -443,7 +443,7 @@ namespace bbtk
                 <<"\" : package not loaded !");
     }
     ClosePackage(i);
-    bbtkDebugDecTab("Core",7);
+    bbtkDebugDecTab("Kernel",7);
   }
   //===================================================================
 
@@ -459,7 +459,7 @@ namespace bbtk
   /// Else simply erases the package entry in the packages map
   void Factory::ClosePackage(PackageMapType::iterator& i) 
   {   
-     bbtkDebugMessageInc("Core",7,"Factory::ClosePackage(\""
+     bbtkDebugMessageInc("Kernel",7,"Factory::ClosePackage(\""
                          <<i->second.mPackage->GetName()
                         <<"\")"<<std::endl);
 
@@ -511,7 +511,7 @@ namespace bbtk
 
     // remove the entry in the map
     mPackageMap.erase(i);
-    bbtkDebugDecTab("Core",7);
+    bbtkDebugDecTab("Kernel",7);
  }
   //===================================================================
 
@@ -521,7 +521,7 @@ namespace bbtk
   /// Displays the list of packages loaded
   void Factory::PrintPackages(bool details, bool adaptors) const
   {
-    bbtkDebugMessageInc("Core",9,"Factory::PrintPackages"<<std::endl);
+    bbtkDebugMessageInc("Kernel",9,"Factory::PrintPackages"<<std::endl);
 
     PackageMapType::const_iterator i;
     for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
@@ -532,7 +532,7 @@ namespace bbtk
       }
     }
 
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
   }
   //===================================================================
 
@@ -540,7 +540,7 @@ namespace bbtk
   /// Displays help on a package
   void Factory::HelpPackage(const std::string& name, bool adaptors) const
   {
-    bbtkDebugMessageInc("Core",9,"Factory::HelpPackage(\""<<name<<"\")"
+    bbtkDebugMessageInc("Kernel",9,"Factory::HelpPackage(\""<<name<<"\")"
                         <<std::endl);
 
     PackageMapType::const_iterator i = mPackageMap.find(name);
@@ -573,11 +573,11 @@ namespace bbtk
       }
     else 
       {
-      bbtkDebugDecTab("Core",9);
+      bbtkDebugDecTab("Kernel",9);
       bbtkError("package \""<<name<<"\" unknown");
       }
     
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
   }
   //===================================================================
 
@@ -585,7 +585,7 @@ namespace bbtk
   /// Prints help on the black box of type <name>
   void Factory::HelpBlackBox(const std::string& name, bool full) const
   {
-    bbtkDebugMessageInc("Core",9,"Factory::HelpBlackBox(\""<<name<<"\")"
+    bbtkDebugMessageInc("Kernel",9,"Factory::HelpBlackBox(\""<<name<<"\")"
                         <<std::endl);
 
     bool found = false;
@@ -599,7 +599,7 @@ namespace bbtk
         }
       }
     
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
     if (!found) 
       {
       bbtkError("No package of the factory contains any black box <"
@@ -613,7 +613,7 @@ namespace bbtk
   /// Inserts a package in the factory
   void Factory::InsertPackage( Package* p )
   {
-    bbtkDebugMessageInc("Core",9,"Factory::InsertPackage(\""<<
+    bbtkDebugMessageInc("Kernel",9,"Factory::InsertPackage(\""<<
                         p->GetName()<<"\")"<<std::endl);
 
     PackageInfoType pack;
@@ -622,7 +622,7 @@ namespace bbtk
     pack.mPackage = p;
 
     mPackageMap[p->GetName()] = pack;
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
   }
   //===================================================================
   
@@ -630,7 +630,7 @@ namespace bbtk
   /// Removes a package from the factory (and deletes it)
   void Factory::RemovePackage( Package* p )
   {
-    bbtkDebugMessageInc("Core",9,"Factory::RemovePackage(\""<<
+    bbtkDebugMessageInc("Kernel",9,"Factory::RemovePackage(\""<<
                         p->GetName()<<"\")"<<std::endl);
 
     PackageMapType::iterator i;
@@ -649,7 +649,7 @@ namespace bbtk
                  p->GetName()<<"\") : package absent from factory");
       }
 
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
   }
   //===================================================================
   
@@ -659,7 +659,7 @@ namespace bbtk
   BlackBox* Factory::NewBlackBox(const std::string& type, 
                                  const std::string& name) const
   {
-    bbtkDebugMessageInc("Core",7,"Factory::NewBlackBox(\""
+    bbtkDebugMessageInc("Kernel",7,"Factory::NewBlackBox(\""
                         <<type<<"\",\""<<name<<"\")"<<std::endl);
 
     BlackBox* b = 0; 
@@ -674,7 +674,7 @@ namespace bbtk
        bbtkError("black box type \""<<type<<"\" unknown");
       } 
 
-    bbtkDebugDecTab("Core",7);
+    bbtkDebugDecTab("Kernel",7);
     return b;
   }
   //===================================================================
@@ -685,7 +685,7 @@ namespace bbtk
                      TypeInfo typeout,
                      const std::string& name) const
   {
-    bbtkDebugMessageInc("Core",8,"Factory::NewAdaptor(<"
+    bbtkDebugMessageInc("Kernel",8,"Factory::NewAdaptor(<"
                         <<TypeName(typein)<<">,<"
                         <<TypeName(typeout)<<">,\""
                         <<name<<"\")"<<bbtkendl);
@@ -706,7 +706,7 @@ namespace bbtk
           <<"> adaptor available");
       } 
     
-    bbtkDebugDecTab("Core",7);
+    bbtkDebugDecTab("Kernel",7);
     return b; 
   }
   //===================================================================
@@ -718,7 +718,7 @@ namespace bbtk
                                      BlackBox* to,
                                      const std::string& input) const
   {
-    bbtkDebugMessage("Core",7,"Factory::NewConnection(\""
+    bbtkDebugMessage("Kernel",7,"Factory::NewConnection(\""
                       <<from->bbGetName()<<"\",\""<<output<<"\",\""
                       <<to->bbGetName()<<"\",\""<<input
                       <<"\")"<<std::endl);
@@ -766,7 +766,7 @@ namespace bbtk
          } 
          c = new AdaptiveConnection(from,output,to,input,b);
       }
-      bbtkDebugDecTab("Core",7);
+      bbtkDebugDecTab("Kernel",7);
     
       return c;
     */
@@ -778,51 +778,51 @@ namespace bbtk
   //===================================================================
   const Package* Factory::GetPackage(const std::string& name) const
   {
-    bbtkDebugMessageInc("Core",9,"Factory::GetPackage(\""<<name<<"\")"
+    bbtkDebugMessageInc("Kernel",9,"Factory::GetPackage(\""<<name<<"\")"
                          <<std::endl);
 
     PackageMapType::const_iterator i = mPackageMap.find(name);
     if ( i != mPackageMap.end() ) 
     {
-      bbtkDebugDecTab("Core",9); 
+      bbtkDebugDecTab("Kernel",9); 
       return i->second.mPackage;
     }
     else 
     {
-       bbtkDebugDecTab("Core",9);
+       bbtkDebugDecTab("Kernel",9);
        bbtkError("package \""<<name<<"\" unknown");
     }
     
-    bbtkDebugDecTab("Core",9);  
+    bbtkDebugDecTab("Kernel",9);  
   }
   //===================================================================
   
   //===================================================================
   Package* Factory::GetPackage(const std::string& name) 
   {
-    bbtkDebugMessageInc("Core",9,"Factory::GetPackage(\""<<name<<"\")"
+    bbtkDebugMessageInc("Kernel",9,"Factory::GetPackage(\""<<name<<"\")"
                          <<std::endl);
 
     PackageMapType::const_iterator i = mPackageMap.find(name);
     if ( i != mPackageMap.end() ) 
     {
-      bbtkDebugDecTab("Core",9); 
+      bbtkDebugDecTab("Kernel",9); 
       return i->second.mPackage;
     }
     else 
     {
-       bbtkDebugDecTab("Core",9);
+       bbtkDebugDecTab("Kernel",9);
        bbtkError("package \""<<name<<"\" unknown");
     }
     
-    bbtkDebugDecTab("Core",9);  
+    bbtkDebugDecTab("Kernel",9);  
   }
   //===================================================================
 
   //===================================================================
   void Factory::WriteDotFilePackagesList(FILE *ff)
   {
-    bbtkDebugMessageInc("Core",9,"Factory::WriteDotFilePackagesList()"
+    bbtkDebugMessageInc("Kernel",9,"Factory::WriteDotFilePackagesList()"
                          <<std::endl);
 
     fprintf( ff , "\n");
@@ -840,7 +840,7 @@ namespace bbtk
        fprintf(ff,"  %s [shape=ellipse, URL=\"%s\"]%s\n",i->first.c_str(),url.c_str(),";" );
     }
     fprintf( ff , "}\n\n");
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
   }
   //===================================================================
 
@@ -881,7 +881,7 @@ namespace bbtk
      }
    }
     
-   bbtkDebugDecTab("Core",9);
+   bbtkDebugDecTab("Kernel",9);
    if (!found) 
    {
       bbtkError("No package of the factory contains any black box <"
@@ -895,7 +895,7 @@ namespace bbtk
   void Factory::CreateHtmlIndex(IndexEntryType type, 
 				const std::string& filename)
   {
-    bbtkDebugMessageInc("Core",9,"Factory::CreateHtmlIndex(\""
+    bbtkDebugMessageInc("Kernel",9,"Factory::CreateHtmlIndex(\""
 			<<filename<<"\")"<<bbtkendl);
     
     std::string title;
@@ -1062,7 +1062,7 @@ namespace bbtk
     //----------------------
 
     // End
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
   }
 
 
diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx
index c5a69ca..694f97a 100644
--- a/kernel/src/bbtkInterpreter.cxx
+++ b/kernel/src/bbtkInterpreter.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkInterpreter.cxx,v $ $
   Language:  C++
-  Date:      $Date: 2008/02/05 12:16:55 $
-  Version:   $Revision: 1.24 $
+  Date:      $Date: 2008/02/05 13:23:46 $
+  Version:   $Revision: 1.25 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -170,7 +170,7 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL;
 
     info.syntax = "index [<filename> ['Initials'(default)|'Packages'|'Categories']]";
     info.help = "Creates an html index of known boxes. If filename is provided then save it to the file 'filename'. The default index entries are the initial letters of the names of the boxes. If 'Packages' or 'Categories' is provided then the entries are either the packages names or the categories";
-    mCommandDict[info.keyword] = info;
+    mCommandDict[info.category] = info;
 
     info.category = "reset";  //EED
     info.argmin = 0;
@@ -1128,7 +1128,7 @@ void Interpreter::Help(const std::vector<std::string>& words)
   /// Displays the Configuration
   void Interpreter::Config() const
   {
-    bbtkDebugMessageInc("Core",9,"Factory::Config"<<std::endl);
+    bbtkDebugMessageInc("Kernel",9,"Factory::Config"<<std::endl);
     
     ConfigurationFile cf = ConfigurationFile::GetInstance();
     
@@ -1164,7 +1164,7 @@ void Interpreter::Help(const std::vector<std::string>& words)
       bbtkMessage("Help",1,"--- ["<<*i<<"]"<<std::endl);
     }
 
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
   }  
 
   //=======================================================================
diff --git a/kernel/src/bbtkMessageManager.cxx b/kernel/src/bbtkMessageManager.cxx
index eede31b..1314b06 100644
--- a/kernel/src/bbtkMessageManager.cxx
+++ b/kernel/src/bbtkMessageManager.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkMessageManager.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/02/05 11:07:42 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2008/02/05 13:23:46 $
+  Version:   $Revision: 1.3 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -29,7 +29,7 @@ namespace bbtk
     
   {
     std::string key;
-    key ="Core";
+    key ="Kernel";
     mMessageLevel[key] = 0;
     mMessageHelp[key] = "Messages generated by the core classes of the lib";
     if (mMaxMessageLength<key.length()) mMaxMessageLength = key.length();
diff --git a/kernel/src/bbtkMessageManager.h b/kernel/src/bbtkMessageManager.h
index 4809db5..898bc7f 100644
--- a/kernel/src/bbtkMessageManager.h
+++ b/kernel/src/bbtkMessageManager.h
@@ -12,7 +12,7 @@
   (for example : "Kernel" messages are generated by the core classes of the library, there can be a type of 
   message for each type of Node, and so on...)
   A type of message must be declared by registering it into the MessageManager. This is done by a line like :
-  bbtk::MessageManager::RegisterMessageType("Core","Messages generated by the core classes of the library",5);
+  bbtk::MessageManager::RegisterMessageType("Kernel","Messages generated by the core classes of the library",5);
   where : 
   -The first string is the type of the message (the category which will be used to generate a message of this type)
   -The second string is help string
@@ -23,16 +23,16 @@
 
   example :
 
-  bbtkMessage("Core",4,"problem with "<<GetName()<<bbtkendl);
+  bbtkMessage("Kernel",4,"problem with "<<GetName()<<bbtkendl);
 
-  will push the 3rd argument in std::cout if the message level of "Core" messages is greater or equal to 4.
+  will push the 3rd argument in std::cout if the message level of "Kernel" messages is greater or equal to 4.
   which means that it generates a message of level 4 (0 : very important/always displayed ... 9 : deep debug message).
 
   At run time, one is able to change the level of the messages displayed by using a command like :
   
-  bbtk::MessageManager::SetMessageLevel("Core",5); 
+  bbtk::MessageManager::SetMessageLevel("Kernel",5); 
   
-  which tells the manager to display all Core messages of level up to 5.
+  which tells the manager to display all Kernel messages of level up to 5.
 
   Variants :
 
diff --git a/kernel/src/bbtkPackage.cxx b/kernel/src/bbtkPackage.cxx
index 21dfbe3..11a1856 100644
--- a/kernel/src/bbtkPackage.cxx
+++ b/kernel/src/bbtkPackage.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkPackage.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/02/05 12:16:55 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2008/02/05 13:23:46 $
+  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
@@ -61,7 +61,7 @@ namespace bbtk
 
     //    std::cout  << "   url=["<<url<<"]"<<std::endl;
     //    std::cout  << "relurl=["<<relurl<<"]"<<std::endl;
-    bbtkDebugMessage("Core",7,"Package::Package(\""<<name<<"\")"<<bbtkendl);
+    bbtkDebugMessage("Kernel",7,"Package::Package(\""<<name<<"\")"<<bbtkendl);
   }
   //==========================================================================
 
@@ -71,7 +71,7 @@ namespace bbtk
   /// Dtor
   Package::~Package()
   {
-    bbtkDebugMessageInc("Core",7,"Package::~Package(\""<<mName<<"\")"<<bbtkendl);
+    bbtkDebugMessageInc("Kernel",7,"Package::~Package(\""<<mName<<"\")"<<bbtkendl);
     BlackBoxMapType::const_iterator i;
     for (i=mBlackBoxMap.begin();
          i!=mBlackBoxMap.end();
@@ -89,7 +89,7 @@ namespace bbtk
          delete j->second;
       }
     */ 
-    bbtkDebugDecTab("Core",7);
+    bbtkDebugDecTab("Kernel",7);
   }
   //==========================================================================
 
@@ -100,16 +100,16 @@ namespace bbtk
   BlackBox* Package::NewBlackBox(const std::string& type, 
 				    const std::string& name) const
   {
-    bbtkDebugMessageInc("Core",8,"Package<"<<GetName()<<">::NewBlackBox(\""<<type<<"\",\""<<name<<"\")"<<bbtkendl);
+    bbtkDebugMessageInc("Kernel",8,"Package<"<<GetName()<<">::NewBlackBox(\""<<type<<"\",\""<<name<<"\")"<<bbtkendl);
     
     BlackBoxMapType::const_iterator i = mBlackBoxMap.find(type);
     if (i == mBlackBoxMap.end())  
     {
-	   bbtkDebugDecTab("Core",8);
+	   bbtkDebugDecTab("Kernel",8);
 	   return 0;
     }
     BlackBox* bb =i->second->CreateInstance(name);
-    bbtkDebugDecTab("Core",8);
+    bbtkDebugDecTab("Kernel",8);
     return bb;   
 
   }
@@ -124,7 +124,7 @@ namespace bbtk
 				   TypeInfo typeout,
 				   const std::string& name) const
   {
-    bbtkDebugMessageInc("Core",8,"Package<"<<GetName()<<
+    bbtkDebugMessageInc("Kernel",8,"Package<"<<GetName()<<
 			">::NewAdaptor(<"
 			<<TypeName(typein)<<">,<"
 			<<TypeName(typeout)<<">,\""
@@ -134,11 +134,11 @@ namespace bbtk
     AdaptorMapType::const_iterator i = mAdaptorMap.find(key);
     if (i == mAdaptorMap.end())  
       {
-	bbtkDebugDecTab("Core",8);
+	bbtkDebugDecTab("Kernel",8);
 	return 0;
       }
     BlackBox* bb =i->second->CreateInstance(name);
-    bbtkDebugDecTab("Core",8);
+    bbtkDebugDecTab("Kernel",8);
     return bb;   
 
   }
@@ -151,7 +151,7 @@ namespace bbtk
   /// Registers a black box descriptor in the package
   bool Package::RegisterBlackBox(BlackBoxDescriptor* d) 
   {
-    bbtkDebugMessageInc("Core",8,"Package<"<<GetName()<<">::RegisterBlackBox(\""<<d->GetTypeName()<<"\")"<<std::endl);
+    bbtkDebugMessageInc("Kernel",8,"Package<"<<GetName()<<">::RegisterBlackBox(\""<<d->GetTypeName()<<"\")"<<std::endl);
     
     mBlackBoxMap[d->GetTypeName()] = d;
     d->SetPackage(this);
@@ -165,7 +165,7 @@ namespace bbtk
 	AdaptorMapType::const_iterator i = mAdaptorMap.find(key);
 	if (i == mAdaptorMap.end())  
 	  {
-	    bbtkDebugMessage("Core",8,"The box is an adaptor, inserting it in adaptors map ..."<<std::endl);   
+	    bbtkDebugMessage("Kernel",8,"The box is an adaptor, inserting it in adaptors map ..."<<std::endl);   
 	    mAdaptorMap[key] = d;
 	  }
 	// If already an adaptor registered : error
@@ -179,7 +179,7 @@ namespace bbtk
 	  }
       }
     
-    bbtkDebugDecTab("Core",8);
+    bbtkDebugDecTab("Kernel",8);
    
     return true;
   }
@@ -190,12 +190,12 @@ namespace bbtk
   /// UnRegisters a black box descriptor from the package
   void Package::UnRegisterBlackBox(const std::string& name) 
   {
-    bbtkDebugMessageInc("Core",8,"Package<"<<GetName()<<">::UnRegisterBlackBox(\""<<name<<"\")"<<std::endl);
+    bbtkDebugMessageInc("Kernel",8,"Package<"<<GetName()<<">::UnRegisterBlackBox(\""<<name<<"\")"<<std::endl);
     // Looking into the bb map
     BlackBoxMapType::iterator i = mBlackBoxMap.find(name);
     if (i == mBlackBoxMap.end())  
     {
-       bbtkDebugDecTab("Core",8);
+       bbtkDebugDecTab("Kernel",8);
        bbtkError("UnRegister : The package <"<<GetName()<<"> does not contains the black box <"<<name<<">");
      }
     mBlackBoxMap.erase(i);
@@ -207,7 +207,7 @@ namespace bbtk
          mAdaptorMap.erase(j);
       }
     */    
-    bbtkDebugDecTab("Core",8);    
+    bbtkDebugDecTab("Kernel",8);    
   }
   //==========================================================================
 
@@ -215,12 +215,12 @@ namespace bbtk
   /// Changes the name of a black box type
   void Package::ChangeBlackBoxName( const std::string& oldname, const std::string& newname )
   { 
-    bbtkDebugMessageInc("Core",8,"Package<"<<GetName()<<">::ChangeBlackBoxName(\""<<oldname<<"\",\""<<newname<<"\")"<<std::endl);
+    bbtkDebugMessageInc("Kernel",8,"Package<"<<GetName()<<">::ChangeBlackBoxName(\""<<oldname<<"\",\""<<newname<<"\")"<<std::endl);
     // Looking into the bb map
     BlackBoxMapType::iterator i = mBlackBoxMap.find(oldname);
     if (i == mBlackBoxMap.end())  
       {
-         bbtkDebugDecTab("Core",8);
+         bbtkDebugDecTab("Kernel",8);
          bbtkError("ChangeBlackBoxName : The package <"<<GetName()<<"> does not contains the black box <"<<oldname<<">");
       }
 
@@ -228,7 +228,7 @@ namespace bbtk
     mBlackBoxMap[newname] = i->second;
     mBlackBoxMap.erase(i);
 
-    bbtkDebugDecTab("Core",8);    
+    bbtkDebugDecTab("Kernel",8);    
   }
   //==========================================================================
 
@@ -238,7 +238,7 @@ namespace bbtk
   /// Registers an adaptor descriptor in the package
   bool Package::RegisterAdaptor(BlackBoxDescriptor* d) 
   {
-    bbtkDebugMessage("Core",8,"Package<"<<GetName()<<">::RegisterAdaptor(\""<<d->GetTypeName()<<"\")"<<std::endl);
+    bbtkDebugMessage("Kernel",8,"Package<"<<GetName()<<">::RegisterAdaptor(\""<<d->GetTypeName()<<"\")"<<std::endl);
     
     TypeInfo typein = d->GetInputDescriptor("In")->GetTypeInfo();
     TypeInfo typeout = d->GetOutputDescriptor("Out")->GetTypeInfo();
@@ -374,18 +374,18 @@ namespace bbtk
   /// Prints help on a black box
   void Package::HelpBlackBox(const std::string& name, bool full) const
   {
-    bbtkDebugMessageInc("Core",8,"Package<"<<GetName()<<">::HelpBlackBox(\""
+    bbtkDebugMessageInc("Kernel",8,"Package<"<<GetName()<<">::HelpBlackBox(\""
 			<<name<<"\")"<<bbtkendl);
 
     BlackBoxMapType::const_iterator i = mBlackBoxMap.find(name);
     if (i == mBlackBoxMap.end())  
       {
-	bbtkDebugDecTab("Core",8);
+	bbtkDebugDecTab("Kernel",8);
 	bbtkError("The package <"<<GetName()<<"> does not contains the black box <"<<name<<">");
       }
     //    bbtkMessage("Help",1,"["<<GetName()<<"] ");
     i->second->GetHelp(full);
-    bbtkDebugDecTab("Core",8);
+    bbtkDebugDecTab("Kernel",8);
 
   }
   //==========================================================================
@@ -395,16 +395,16 @@ namespace bbtk
   /// Returns true iff the package contains the box of name boxname
   bool Package::ContainsBlackBox(const std::string& name) const 
   {
-    bbtkDebugMessageInc("Core",8,"Package<"<<GetName()<<">::HelpBlackBox(\""
+    bbtkDebugMessageInc("Kernel",8,"Package<"<<GetName()<<">::HelpBlackBox(\""
 			<<name<<"\")"<<bbtkendl);
     
     BlackBoxMapType::const_iterator i = mBlackBoxMap.find(name);
     if (i == mBlackBoxMap.end())  
     {
-      bbtkDebugDecTab("Core",8);
+      bbtkDebugDecTab("Kernel",8);
       return false;
     }
-    bbtkDebugDecTab("Core",8);
+    bbtkDebugDecTab("Kernel",8);
     return true;
   }
   //==========================================================================
@@ -421,7 +421,7 @@ namespace bbtk
 			       int level,
 			       bool relative_link ) const
   {
-    bbtkDebugMessageInc("Core",9,"Package<"<<GetName()<<">::CreateHtmlPage(\""
+    bbtkDebugMessageInc("Kernel",9,"Package<"<<GetName()<<">::CreateHtmlPage(\""
 			<<filename<<"\")"<<bbtkendl);
 
     //---------------------
@@ -633,7 +633,7 @@ namespace bbtk
     //----------------------
 
     // End
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
   }
   //==========================================================================
 }
diff --git a/kernel/src/bbtkUserBlackBox.cxx b/kernel/src/bbtkUserBlackBox.cxx
index 4c3beab..3f0dc0e 100644
--- a/kernel/src/bbtkUserBlackBox.cxx
+++ b/kernel/src/bbtkUserBlackBox.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkUserBlackBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/01/22 15:02:00 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/02/05 13:23:46 $
+  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
@@ -30,10 +30,10 @@ namespace bbtk
   UserBlackBox::UserBlackBox(const std::string &name, bool alloc)
     : BlackBox(name)
   {
-    bbtkDebugMessageInc("Core",7,
+    bbtkDebugMessageInc("Kernel",7,
     			"UserBlackBox::UserBlackBox(\""
 			<<name<<"\")"<<std::endl);
-    bbtkDebugDecTab("Core",7);
+    bbtkDebugDecTab("Kernel",7);
   }
   //========================================================================= 
   
@@ -44,11 +44,11 @@ namespace bbtk
 			     bool alloc)
     : BlackBox(from,name)
   {
-    bbtkDebugMessageInc("Core",7,
+    bbtkDebugMessageInc("Kernel",7,
     			"UserBlackBox::UserBlackBox("
 			<<from.bbGetFullName()<<",\""
 			<<name<<"\")"<<std::endl);
-    bbtkDebugDecTab("Core",7);
+    bbtkDebugDecTab("Kernel",7);
     
   }
   //=========================================================================
@@ -58,7 +58,7 @@ namespace bbtk
   ///  Destructor
   UserBlackBox::~UserBlackBox()
   {
-    bbtkDebugMessage("Core",7,"UserBlackBox::~UserBlackBox()"
+    bbtkDebugMessage("Kernel",7,"UserBlackBox::~UserBlackBox()"
 		     <<std::endl);
   } 
   //=========================================================================
diff --git a/kernel/src/bbtkUserBlackBoxGetSetFunctor.h b/kernel/src/bbtkUserBlackBoxGetSetFunctor.h
index 8573cc6..cbab151 100644
--- a/kernel/src/bbtkUserBlackBoxGetSetFunctor.h
+++ b/kernel/src/bbtkUserBlackBoxGetSetFunctor.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkUserBlackBoxGetSetFunctor.h,v $
   Language:  C++
-  Date:      $Date: 2008/01/22 15:02:00 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/02/05 13:23:46 $
+  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
@@ -177,7 +177,7 @@ namespace bbtk
       //      bbtkAssert( bbtkEqualTypes( d.type(), typeid(T) ) );
       T t = d.unsafe_get<T>();
       (((UBB*)o)->*mSetMethodPointer)(t);
-      //      bbtkDebugMessage("Core",9,"SetOK"<<std::endl);
+      //      bbtkDebugMessage("Kernel",9,"SetOK"<<std::endl);
     }
 
     /// 
diff --git a/kernel/src/bbtkUserBlackBoxInputDescriptor.cxx b/kernel/src/bbtkUserBlackBoxInputDescriptor.cxx
index 297b612..38a8077 100644
--- a/kernel/src/bbtkUserBlackBoxInputDescriptor.cxx
+++ b/kernel/src/bbtkUserBlackBoxInputDescriptor.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkUserBlackBoxInputDescriptor.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/01/22 15:02:00 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/02/05 13:23:46 $
+  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
@@ -36,7 +36,7 @@ namespace bbtk
     mGetFunctor(getfunctor),
     mSetFunctor(setfunctor)
   {  
-    bbtkDebugMessage("Core",9,
+    bbtkDebugMessage("Kernel",9,
 		     "UserBlackBoxInputDescriptor::"
 		     <<"UserBlackBoxInputDescriptor(\""
 		     <<name<<"\",\""<<description<<"\","
@@ -48,7 +48,7 @@ namespace bbtk
 
   UserBlackBoxInputDescriptor::~UserBlackBoxInputDescriptor()
   {
-    bbtkDebugMessage("Core",9,
+    bbtkDebugMessage("Kernel",9,
 		     "UserBlackBoxInputDescriptor::"
 		     <<"~UserBlackBoxInputDescriptor(\""
 		     <<GetName()<<"\",\""<<GetDescription()<<"\","
diff --git a/kernel/src/bbtkUserBlackBoxMacros.h b/kernel/src/bbtkUserBlackBoxMacros.h
index 07839e3..660d8b6 100644
--- a/kernel/src/bbtkUserBlackBoxMacros.h
+++ b/kernel/src/bbtkUserBlackBoxMacros.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkUserBlackBoxMacros.h,v $
   Language:  C++
-  Date:      $Date: 2008/02/05 12:16:55 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2008/02/05 13:23:46 $
+  Version:   $Revision: 1.6 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -38,18 +38,18 @@
   public: \
   inline static CLASS* bbNew(const std::string& name)			\
   {									\
-    bbtkDebugMessageInc("Core",9,#CLASS<<"::bbNew(\""<<name<<"\")"<<std::endl); \
+    bbtkDebugMessageInc("Kernel",9,#CLASS<<"::bbNew(\""<<name<<"\")"<<std::endl); \
     bbCreateDescriptorIfNeeded();					\
     CLASS* c = new CLASS(name);						\
-    bbtkDebugDecTab("Core",9);						\
+    bbtkDebugDecTab("Kernel",9);						\
     return c;								\
   }									\
   inline bbtk::BlackBox* bbClone(const std::string& name)		\
   {									\
-    bbtkDebugMessageInc("Core",9,#CLASS<<"::bbClone(\""<<name<<"\")"<<std::endl); \
+    bbtkDebugMessageInc("Kernel",9,#CLASS<<"::bbClone(\""<<name<<"\")"<<std::endl); \
     bbCreateDescriptorIfNeeded();					\
     CLASS* c = new CLASS(*this,name);					\
-    bbtkDebugDecTab("Core",9);						\
+    bbtkDebugDecTab("Kernel",9);						\
     return c;								\
   }									\
   bbtk::BlackBoxDescriptor* bbGetDescriptor() const			\
@@ -137,14 +137,14 @@
 
 //============================================================================
 #define BBTK_BEGIN_BLACK_BOX_CONSTRUCTOR(CLASS,ALLOC)			\
-  bbtkDebugMessageInc("Core",7,#CLASS<<"::"<<#CLASS			\
+  bbtkDebugMessageInc("Kernel",7,#CLASS<<"::"<<#CLASS			\
 		      <<"(\""<<bbGetName()<<"\")"<<std::endl);		\
   if (ALLOC) bbAllocateConnectors();					
 //============================================================================
 
 //============================================================================
 #define BBTK_BEGIN_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,FROM,ALLOC)		\
-  bbtkDebugMessageInc("Core",7,#CLASS<<"::"<<#CLASS			\
+  bbtkDebugMessageInc("Kernel",7,#CLASS<<"::"<<#CLASS			\
 		      <<"("<<FROM.bbGetFullName()<<",\""		\
 		      <<bbGetName()<<"\")"<<std::endl);			\
   if (ALLOC)								\
@@ -157,12 +157,12 @@
 
 //============================================================================
 #define BBTK_END_BLACK_BOX_CONSTRUCTOR		\
-  bbtkDebugDecTab("Core",7)
+  bbtkDebugDecTab("Kernel",7)
 //============================================================================
 
 //============================================================================
 #define BBTK_BEGIN_BLACK_BOX_DESTRUCTOR(CLASS)				\
-  bbtkDebugMessageInc("Core",7,#CLASS <<"::~"<< #CLASS			\
+  bbtkDebugMessageInc("Kernel",7,#CLASS <<"::~"<< #CLASS			\
 		      <<"() ["<<this->bbGetFullName()<<"]"<<std::endl);
 //============================================================================
 
@@ -171,7 +171,7 @@
 
 //============================================================================
 #define BBTK_END_BLACK_BOX_DESTRUCTOR		\
-  bbtkDebugDecTab("Core",7)
+  bbtkDebugDecTab("Kernel",7)
 //============================================================================
 
 
@@ -214,14 +214,14 @@
     }									\
     CLASS ## Descriptor()						\
       {									\
-	bbtkDebugMessageInc("Core",9,#CLASS<<"Descriptor::"<<#CLASS	\
+	bbtkDebugMessageInc("Kernel",9,#CLASS<<"Descriptor::"<<#CLASS	\
 			    <<"Descriptor()"<<std::endl)
 //============================================================================
 
 //============================================================================
 /// Ends the UserBlackBox description block
 #define BBTK_END_DESCRIBE_BLACK_BOX(CLASS)				\
-  bbtkDecTab("Core",9);							\
+  bbtkDecTab("Kernel",9);							\
   }									\
   };									\
   void CLASS::bbCreateDescriptorIfNeeded()				\
@@ -341,14 +341,14 @@
     }									\
     CLASS ## Descriptor()						\
       {									\
-	bbtkDebugMessageInc("Core",9,#CLASS<<"Descriptor::"<<#CLASS	\
+	bbtkDebugMessageInc("Kernel",9,#CLASS<<"Descriptor::"<<#CLASS	\
 			    <<"Descriptor()"<<std::endl)
 //============================================================================
 
 //============================================================================
 /// Ends a template UserBlackBox of template param T description block
 #define BBTK_END_DESCRIBE_TEMPLATE_BLACK_BOX(CLASS)	\
-  bbtkDecTab("Core",9);							\
+  bbtkDecTab("Kernel",9);							\
   }									\
   };									\
   template <class T>					\
@@ -425,14 +425,14 @@
     }									\
     CLASS ## Descriptor()						\
       {									\
-      bbtkDebugMessageInc("Core",9,#CLASS<<"Descriptor::"<<#CLASS	\
+      bbtkDebugMessageInc("Kernel",9,#CLASS<<"Descriptor::"<<#CLASS	\
 			  <<"Descriptor()"<<std::endl)
 //============================================================================
 
 //============================================================================
 /// Ends a template UserBlackBox description block of template param T1 and T2
 #define BBTK_END_DESCRIBE_TEMPLATE2_BLACK_BOX(CLASS)		\
-  bbtkDecTab("Core",9);							\
+  bbtkDecTab("Kernel",9);							\
   }									\
   };									\
   template <class T1, class T2>						\
@@ -458,14 +458,14 @@
     }									\
     CLASS ## Descriptor()						\
       {									\
-      bbtkDebugMessageInc("Core",9,#CLASS<<"Descriptor::"<<#CLASS	\
+      bbtkDebugMessageInc("Kernel",9,#CLASS<<"Descriptor::"<<#CLASS	\
 			  <<"Descriptor()"<<std::endl)
 //============================================================================
 
 //============================================================================
 /// Ends a template UserBlackBox description block of template param T1 and T2
 #define BBTK_END_DESCRIBE_TEMPLATE2_WITH_TYPES_BLACK_BOX(CLASS,TYPE1,TYPE2)	\
-  bbtkDecTab("Core",9);							\
+  bbtkDecTab("Kernel",9);							\
   }									\
   };									\
   template <TYPE1 T1, TYPE2 T2>						\
diff --git a/kernel/src/bbtkUserBlackBoxOutputDescriptor.cxx b/kernel/src/bbtkUserBlackBoxOutputDescriptor.cxx
index 7b46e64..df4d588 100644
--- a/kernel/src/bbtkUserBlackBoxOutputDescriptor.cxx
+++ b/kernel/src/bbtkUserBlackBoxOutputDescriptor.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkUserBlackBoxOutputDescriptor.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/01/22 15:02:00 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/02/05 13:23:46 $
+  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
@@ -38,7 +38,7 @@ namespace bbtk
     mSetFunctor(setfunctor)
   {    
     
-    bbtkDebugMessage("Core",9,
+    bbtkDebugMessage("Kernel",9,
 		     "UserBlackBoxOutputDescriptor::UserBlackBoxOutputDescriptor(\""
 		     <<name<<"\",\""<<description
 		     <<"\""<<getfunctor<<","<<setfunctor
@@ -48,7 +48,7 @@ namespace bbtk
 
   UserBlackBoxOutputDescriptor::~UserBlackBoxOutputDescriptor() 
   {
-    bbtkDebugMessage("Core",9,"UserBlackBoxOutputDescriptor::~UserBlackBoxOutputDescriptor(\""<<GetName()<<"\",\""<<GetDescription()<<"\""<<mGetFunctor<<","<<mSetFunctor<<")"<<std::endl);
+    bbtkDebugMessage("Kernel",9,"UserBlackBoxOutputDescriptor::~UserBlackBoxOutputDescriptor(\""<<GetName()<<"\",\""<<GetDescription()<<"\""<<mGetFunctor<<","<<mSetFunctor<<")"<<std::endl);
   }
   
 }
diff --git a/kernel/src/bbtkWxBlackBox.cxx b/kernel/src/bbtkWxBlackBox.cxx
index 9e2507a..a14647e 100644
--- a/kernel/src/bbtkWxBlackBox.cxx
+++ b/kernel/src/bbtkWxBlackBox.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxBlackBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/01/28 14:32:54 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2008/02/05 13:23:46 $
+  Version:   $Revision: 1.4 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -424,7 +424,7 @@ namespace bbtk
   wxWindow* WxParentToChildData::GetWindowInWhichToInsert( const BlackBox* b)
     const
   {
-    bbtkDebugMessageInc("Core",9,"WxParentToChildData::GetWindowInWhichToInsert("<<b->bbGetFullName()<<")"<<std::endl);
+    bbtkDebugMessageInc("Kernel",9,"WxParentToChildData::GetWindowInWhichToInsert("<<b->bbGetFullName()<<")"<<std::endl);
     
     BlackBox::InputConnectorMapType::const_iterator i = b->bbGetInputConnectorMap().find("WinParent");
     if (i==b->bbGetInputConnectorMap().end())
@@ -436,7 +436,7 @@ namespace bbtk
     Connection* c = i->second->GetConnection();
     if (!c) 
       {
-	bbtkDebugMessage("Core",9,
+	bbtkDebugMessage("Kernel",9,
 			 "-> The input 'Parent' of the box "
 			 <<b->bbGetFullName()
 			 <<" is not connected."<<std::endl);
@@ -453,7 +453,7 @@ namespace bbtk
 		  <<") no window provided by parent ?!?");
       }
 
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
     return j->second;
   }
   //=========================================================================
@@ -473,7 +473,7 @@ namespace bbtk
   //=========================================================================
   void WxBlackBox::bbUserConstructor()
   {
-    bbtkDebugMessage("Core",9,"WxBlackBox::bbUserConstructor()"<<std::endl);
+    bbtkDebugMessage("Kernel",9,"WxBlackBox::bbUserConstructor()"<<std::endl);
     bbInitAttributes();
   }
   //=========================================================================
@@ -481,7 +481,7 @@ namespace bbtk
   //=========================================================================
   void WxBlackBox::bbUserCopyConstructor()
   {
-    bbtkDebugMessage("Core",9,"WxBlackBox::bbUserCopyConstructor()"
+    bbtkDebugMessage("Kernel",9,"WxBlackBox::bbUserCopyConstructor()"
 		     <<std::endl);
     bbInitAttributes();
   }
@@ -491,12 +491,12 @@ namespace bbtk
   //=========================================================================
   void WxBlackBox::bbUserDestructor()
   {
-    bbtkDebugMessage("Core",9,"WxBlackBox::bbUserDestructor()"<<std::endl);
+    bbtkDebugMessage("Kernel",9,"WxBlackBox::bbUserDestructor()"<<std::endl);
     if (bbGetWindow()) {
       delete bbGetWindow();
       //      bbSetWindow(0);
     }
-    bbtkDebugMessage("Core",9,"EO WxBlackBox::bbUserDestructor()"<<std::endl);
+    bbtkDebugMessage("Kernel",9,"EO WxBlackBox::bbUserDestructor()"<<std::endl);
   }
   //=========================================================================
   
diff --git a/packages/wx/bbs/appli/testSplit.bbs b/packages/wx/bbs/appli/testSplit.bbs
index 6bc8c90..0c76ccf 100644
--- a/packages/wx/bbs/appli/testSplit.bbs
+++ b/packages/wx/bbs/appli/testSplit.bbs
@@ -1,6 +1,6 @@
 description "Simple test of wx::Split widget"
 author "laurent.guigues@creatis.insa-lyon.fr"
-keyword "test;wx"
+category "test"
 
 load wx
 
diff --git a/packages/wx/src/bbwxSizer.cxx b/packages/wx/src/bbwxSizer.cxx
index 4648dd6..fab3e25 100644
--- a/packages/wx/src/bbwxSizer.cxx
+++ b/packages/wx/src/bbwxSizer.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxSizer.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/02/04 16:42:10 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/02/05 13:23:47 $
+  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
@@ -144,7 +144,7 @@ namespace bbwx
 /*  
   wxWindow *Sizer::CreateWxWindow(wxWindow *parent)
   {
-    bbtkDebugMessageInc("Core",9,"Sizer::CreateWxWindow("<<parent<<")"<<std::endl);
+    bbtkDebugMessageInc("Kernel",9,"Sizer::CreateWxWindow("<<parent<<")"<<std::endl);
     
     wxWidgetSizer *wxwidgetsizer = new wxWidgetSizer(parent,bbGetInputOrientation() );
 
@@ -169,7 +169,7 @@ namespace bbwx
     //
     wxwidgetsizer->SetSizer(this);
     
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
     
 	Setmwxcontainer(wxwidgetsizer);
 
diff --git a/packages/wx/src/bbwxSplit.cxx b/packages/wx/src/bbwxSplit.cxx
index 7386ef3..bf8dbea 100644
--- a/packages/wx/src/bbwxSplit.cxx
+++ b/packages/wx/src/bbwxSplit.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxSplit.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/01/22 15:41:35 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2008/02/05 13:23:47 $
+  Version:   $Revision: 1.3 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -147,7 +147,7 @@ namespace bbwx
   bbtk::WxBlackBoxWidget *Split::bbUserCreateWidget(wxWindow *parent)
   {
     //printf("EED Split::CreateWxWindow \n" );
-    bbtkDebugMessageInc("Core",9,"Split::bbUserCreateWidget("<<parent<<")"<<std::endl);
+    bbtkDebugMessageInc("Kernel",9,"Split::bbUserCreateWidget("<<parent<<")"<<std::endl);
     
     SplitWidget *wxwidgetsplit = new SplitWidget(this, parent , 
 						 bbGetInputOrientation() );
@@ -180,7 +180,7 @@ namespace bbwx
     //
     
 
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
 
     return wxwidgetsplit;
 
-- 
2.45.1