X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkPackage.cxx;h=50c98ba856647e6d0e446d2010aa2a0cab752505;hb=ca35bb0588533c9eac29b7d3ef8689c97ccfcfe7;hp=921682c743a9922525d81940f17aab36241d43e9;hpb=ab0cfcfdd031ff179ed1550874c648a54d8e1023;p=bbtk.git

diff --git a/kernel/src/bbtkPackage.cxx b/kernel/src/bbtkPackage.cxx
index 921682c..50c98ba 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: 2009/04/21 14:36:51 $
-  Version:   $Revision: 1.25 $
+  Date:      $Date: 2010/01/14 13:17:27 $
+  Version:   $Revision: 1.33 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -34,6 +34,7 @@
  *\brief Class bbtk::Package : registers black boxes descriptors and is able to create instances of the black boxes registered.
  */
 #include "bbtkPackage.h"
+#include "bbtkComplexBlackBoxDescriptor.h"
 #include "bbtkMessageManager.h"
 #include "bbtkConfigurationFile.h"
 #include <fstream>
@@ -77,7 +78,7 @@ namespace bbtk
     mDescription(description),
     mVersion(version)
   {
-    bbtkDebugMessage("object",2,"==> Package::Package('"<<name<<"',...)"
+    bbtkDebugMessage("object",2,"==> Package('"<<name<<"',...)"
 		     <<bbtkendl);
     std::string default_doc_dir = ConfigurationFile::GetInstance().Get_default_temp_dir();
     char c = default_doc_dir.c_str()[strlen(default_doc_dir.c_str())-1];
@@ -111,8 +112,7 @@ namespace bbtk
   /// Dtor
   Package::~Package()
   {
-    bbtkDebugMessage("object",2,"==> Package::~Package(\""<<mName<<"\")"<<bbtkendl);
-    bbtkDebugMessage("object",2,"<== Package::~Package(\""<<mName<<"\")"<<bbtkendl);
+    bbtkDebugMessage("object",2,"==> ~Package(\""<<mName<<"\")"<<bbtkendl);
   }
   //==========================================================================
 
@@ -123,20 +123,20 @@ namespace bbtk
   {
     // Try to release descriptor
     std::string packname = pack.lock()->GetName();
-
+    
     bbtkDebugMessage("package",5,"--- Releasing descriptor '"
 		     <<packname<<"::"<<descname<<"'"<<bbtkendl);
-
-
-    Package::BlackBoxMapType::iterator desc = 
-      pack.lock()->GetBlackBoxMap().find(descname);
-    if (desc ==  pack.lock()->GetBlackBoxMap().end())
+    
+    
+    Package::DescriptorMapType::iterator desc = 
+      pack.lock()->GetDescriptorMap().find(descname);
+    if (desc ==  pack.lock()->GetDescriptorMap().end())
       {
 	bbtkDebugMessage("package",5,
 			 "    Descriptor has already been released"
-			 <<bbtkendl);
+			<<bbtkendl);
 	return;
-      }
+		  }
     //    bbtkDebugMessage("package",3,
     //		     "    Trying unreferencing it ... "<<std::endl);
     BlackBoxDescriptor::WeakPointer pdesc = desc->second;
@@ -148,21 +148,18 @@ namespace bbtk
 	if (pack.expired()) 
 	  {
 	    bbtkDebugMessage("package",2,
-			     "     ... and caused its package death"
+                             "     ... and caused its package death"
 			     <<bbtkendl);
 	    return;
-	  }
-	desc = pack.lock()->GetBlackBoxMap().find(descname);
-	if (desc !=  pack.lock()->GetBlackBoxMap().end())
-	  pack.lock()->GetBlackBoxMap().erase(desc);
-      }
-    else 
-      {
-	bbtkDebugMessage("package",5,"    ... Descriptor still alive ("
-			 <<pdesc.use_count()<<" refs)"
-			 <<bbtkendl);
-	pack.lock()->GetBlackBoxMap()[descname] = pdesc.lock();
-      }
+	  } // pack.expired
+	desc = pack.lock()->GetDescriptorMap().find(descname);
+	if (desc !=  pack.lock()->GetDescriptorMap().end())	  pack.lock()->GetDescriptorMap().erase(desc);
+      }   else    {  //pdesc.expired
+      bbtkDebugMessage("package",5,"    ... Descriptor still alive ("
+		       <<pdesc.use_count()<<" refs)"
+		       <<bbtkendl);
+      pack.lock()->GetDescriptorMap()[descname] = pdesc.lock();
+    } // pdesc.expired
   }
   //==========================================================================
 
@@ -176,7 +173,7 @@ namespace bbtk
 		     packname<<"')"<<bbtkendl);
 
     long dyn = pack.lock()->mDynamicLibraryHandler ? 1:0; 
-    long ndesc = pack.lock()->GetBlackBoxMap().size();
+    long ndesc = pack.lock()->GetDescriptorMap().size();
     long nrefs = pack.use_count();
 
     bbtkDebugMessage("package",5," "<<nrefs<<" refs / "
@@ -210,9 +207,9 @@ namespace bbtk
 
 	// The list of descriptors names at start
 	std::vector<std::string> descnamelist;
-	BlackBoxMapType::iterator i;
-	for (i=pack.lock()->mBlackBoxMap.begin();
-	     i!= pack.lock()->mBlackBoxMap.end();
+	DescriptorMapType::iterator i;
+	for (i=pack.lock()->mDescriptorMap.begin();
+	     i!= pack.lock()->mDescriptorMap.end();
 	     ++i)
 	  descnamelist.push_back(i->first);
 
@@ -230,19 +227,24 @@ namespace bbtk
 				 <<"') : package expired during release : bailing out"<<bbtkendl);
 		break;
 	      }
-	    
-	    PackageReleaseBlackBoxDescriptorInternal(pack,*descname);
-	    
+  
+#if defined(MACOSX)
+		  BlackBoxDescriptor::Pointer desc = pack.lock()->mDescriptorMap[*descname];
+		  if ( (dyn==0) || (boost::dynamic_pointer_cast<ComplexBlackBoxDescriptor>(desc)) )
+		  {
+			  PackageReleaseBlackBoxDescriptorInternal(pack,*descname);
+		  } 
+#else
+		  PackageReleaseBlackBoxDescriptorInternal(pack,*descname);
+#endif
+
 	  }
 
 	//
 	UnLoadDynamicLibrary(pack);
 	// Unload orphan dl packages 
 	Package::UnLoadReleasedDynamicallyLoadedPackages();
-	
 
-	
-	
       }
     
 #ifdef BBTK_COMPILE_DEBUG_MESSAGES
@@ -253,7 +255,7 @@ namespace bbtk
     if (!pack.expired())
       {
 	long dyn = pack.lock()->mDynamicLibraryHandler ? 1:0; 
-	long ndesc = pack.lock()->GetBlackBoxMap().size();
+	long ndesc = pack.lock()->GetDescriptorMap().size();
 	long nrefs = pack.use_count();
 	
 	bbtkDebugMessage("package",1," ... Package still alive ("
@@ -286,7 +288,7 @@ namespace bbtk
 		     <<descr.use_count()<<bbtkendl);
 
     long dyn = pack.lock()->mDynamicLibraryHandler ? 1:0; 
-    long ndesc = pack.lock()->GetBlackBoxMap().size();
+    long ndesc = pack.lock()->GetDescriptorMap().size();
     long nrefs = pack.use_count();
 
     bbtkDebugMessage("package",5," "<<nrefs<<" refs / "
@@ -302,7 +304,13 @@ namespace bbtk
     //  and descallocated (reset) by PACKAGENAMEDeletePackage())
     if (nrefs == ndesc + dyn) 
       {
-	PackageReleaseBlackBoxDescriptorInternal(pack,dname);
+#if defined(MACOSX)
+		  //
+		  if (dyn==0)
+			  PackageReleaseBlackBoxDescriptorInternal(pack,dname);
+#else
+		  PackageReleaseBlackBoxDescriptorInternal(pack,dname);
+#endif	
       }
     
     // If the package is released and dynamically loaded 
@@ -316,7 +324,7 @@ namespace bbtk
     if (!pack.expired())
       {
 	long dyn = pack.lock()->mDynamicLibraryHandler ? 1:0; 
-	long ndesc = pack.lock()->GetBlackBoxMap().size();
+	long ndesc = pack.lock()->GetDescriptorMap().size();
 	long nrefs = pack.use_count();
 	
 	bbtkDebugMessage("package",3," ... Package still alive ("
@@ -353,8 +361,9 @@ namespace bbtk
 
     // Open shared lib
     void *handler;
-    handler = dlopen(libname.c_str(),
-		     BBTK_RTLD_TIME | BBTK_RTLD_SCOPE );
+    handler = dlopen(libname.c_str(), BBTK_RTLD_TIME | BBTK_RTLD_SCOPE );
+//EED     handler = dlopen(libname.c_str(), RTLD_LAZY | RTLD_LOCAL );
+	  
     if (!handler)
       {
 	bbtkMessage("package",2,
@@ -572,7 +581,7 @@ namespace bbtk
 		     <<packname<<"')"
 		     <<std::endl);
     
-    if (!pack.lock()->GetBlackBoxMap().empty())
+    if (!pack.lock()->GetDescriptorMap().empty())
       {
 	
 	bbtkDebugMessage("package",5,"   Package not empty ... abort"
@@ -580,7 +589,7 @@ namespace bbtk
 	return;
 	/*
 	bbtkGlobalError("Package::UnLoadDynamicLibrary('"<<packname<<") : "
-			<<"BlackBoxMap not empty "
+			<<"DescriptorMap not empty "
 			<<BBTK_INTERNAL_ERROR_MESSAGE);
 	*/
 	
@@ -654,7 +663,13 @@ namespace bbtk
     
     // closes the dl handler
 #if defined(__GNUC__)  
-    dlclose(h);  
+	  if (dlclose(h)!=0)
+	  {
+		  printf("EED Package::UnLoad ERROR %s\n", packname.c_str() );
+		  bbtkWarning("Failed to close dynamic library for package '"<<packname
+					  <<"'"<<std::endl);
+	  }  
+	  
 #elif defined(_WIN32)
     FreeLibrary(h);
 #endif
@@ -671,16 +686,16 @@ namespace bbtk
   BlackBox::Pointer Package::NewBlackBox(const std::string& type, 
 					 const std::string& name) const
   {
-    bbtkDebugMessageInc("Kernel",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())  
+    DescriptorMapType::const_iterator i = mDescriptorMap.find(type);
+    if (i == mDescriptorMap.end())  
     {
-	   bbtkDebugDecTab("Kernel",8);
+	   bbtkDebugDecTab("kernel",8);
 	   return BlackBox::Pointer();
     }
     BlackBox::Pointer bb =i->second->NewBlackBox(name);
-    bbtkDebugDecTab("Kernel",8);
+    bbtkDebugDecTab("kernel",8);
     return bb;   
 
   }
@@ -695,7 +710,7 @@ namespace bbtk
 				const DataInfo& typeout,
 				const std::string& name) const
   {
-    bbtkDebugMessageInc("Kernel",8,"Package<"<<GetName()<<
+    bbtkDebugMessageInc("kernel",8,"Package<"<<GetName()<<
 			">::NewAdaptor("
 			<<typein<<","
 			<<typeout<<",\""
@@ -706,11 +721,11 @@ namespace bbtk
     AdaptorMapType::const_iterator i = mAdaptorMap.find(key);
     if (i == mAdaptorMap.end())  
       {
-	bbtkDebugDecTab("Kernel",8);
+	bbtkDebugDecTab("kernel",8);
 	return BlackBox::Pointer();
       }
     BlackBox::Pointer bb =i->second.lock()->NewBlackBox(name);
-    bbtkDebugDecTab("Kernel",8);
+    bbtkDebugDecTab("kernel",8);
     return bb;   
 
   }
@@ -723,7 +738,7 @@ namespace bbtk
 				      const DataInfo& typeout,
 				      const std::string& name) const
   {
-    bbtkDebugMessageInc("Kernel",8,"Package<"<<GetName()<<
+    bbtkDebugMessageInc("kernel",8,"Package<"<<GetName()<<
 			">::NewWidgetAdaptor("
 			<<typein<<","
 			<<typeout<<",\""
@@ -734,11 +749,11 @@ namespace bbtk
     AdaptorMapType::const_iterator i = mAdaptorMap.find(key);
     if (i == mAdaptorMap.end())  
       {
-	bbtkDebugDecTab("Kernel",8);
+	bbtkDebugDecTab("kernel",8);
 	return BlackBox::Pointer();
       }
     BlackBox::Pointer bb =i->second.lock()->NewBlackBox(name);
-    bbtkDebugDecTab("Kernel",8);
+    bbtkDebugDecTab("kernel",8);
     return bb;   
 
   }
@@ -755,7 +770,7 @@ namespace bbtk
 				  const DataInfo& typeout,
 				  std::string& adaptor) const
   {
-    bbtkDebugMessageInc("Kernel",8,"Package<"<<GetName()<<
+    bbtkDebugMessageInc("kernel",8,"Package<"<<GetName()<<
 			">::FindWidgetAdaptor("
 			<<typein<<","
 			<<typeout<<")"<<bbtkendl);
@@ -768,11 +783,11 @@ namespace bbtk
     AdaptorMapType::const_iterator i = mAdaptorMap.find(key);
     if (i == mAdaptorMap.end())  
       {
-	bbtkDebugDecTab("Kernel",8);
+	bbtkDebugDecTab("kernel",8);
 	return false;
       }
     adaptor = i->second.lock()->GetTypeName();
-    bbtkDebugDecTab("Kernel",8);
+    bbtkDebugDecTab("kernel",8);
     return true;   
 
   }
@@ -789,7 +804,7 @@ namespace bbtk
 			    const DataInfo& typeout,
 			    std::string& adaptor) const
   {
-    bbtkDebugMessageInc("Kernel",8,"Package<"<<GetName()<<
+    bbtkDebugMessageInc("kernel",8,"Package<"<<GetName()<<
 			">::FindAdaptor("
 			<<typein<<","
 			<<typeout<<")"<<bbtkendl);
@@ -799,11 +814,11 @@ namespace bbtk
     AdaptorMapType::const_iterator i = mAdaptorMap.find(key);
     if (i == mAdaptorMap.end())  
       {
-	bbtkDebugDecTab("Kernel",8);
+	bbtkDebugDecTab("kernel",8);
 	return false;
       }
     adaptor = i->second.lock()->GetTypeName();
-    bbtkDebugDecTab("Kernel",8);
+    bbtkDebugDecTab("kernel",8);
     return true;   
 
   }
@@ -812,26 +827,26 @@ namespace bbtk
 
   //==========================================================================
   /// Registers a black box descriptor in the package
-  bool Package::RegisterBlackBox(BlackBoxDescriptor::Pointer d) 
+  bool Package::Register(BlackBoxDescriptor::Pointer d) 
   {
-    bbtkDebugMessageInc("Kernel",8,"Package<"<<GetName()<<">::RegisterBlackBox(\""<<d->GetTypeName()<<"\")"<<std::endl);
+    bbtkDebugMessageInc("kernel",8,"Package<"<<GetName()<<">::Register(\""<<d->GetTypeName()<<"\")"<<std::endl);
     
-    BlackBoxMapType::iterator i = mBlackBoxMap.find(d->GetTypeName());
-    if (i!=mBlackBoxMap.end())
+    DescriptorMapType::iterator i = mDescriptorMap.find(d->GetTypeName());
+    if (i!=mDescriptorMap.end())
       {
 	bbtkWarning("Package<"<<GetName()<<"> : Trying to register box type <"
 		    <<d->GetTypeName()<<"> which is already in the package");
 	return false;
       }
 
-    mBlackBoxMap[d->GetTypeName()] = d;
+    mDescriptorMap[d->GetTypeName()] = d;
     //    d->Reference();
     d->SetPackage(GetThisPointer<Package>());
     
     // If it is a default adaptor, also register it in the adaptors map
     if ( d->GetKind() == BlackBoxDescriptor::DEFAULT_ADAPTOR )
       {
-	bbtkDebugMessage("Kernel",8,"Package<"<<GetName()<<">::RegisterBlackBox(\""<<d->GetTypeName()<<"\") : The box is an adaptor, inserting it in adaptors map ..."<<std::endl);   
+	bbtkDebugMessage("kernel",8,"Package<"<<GetName()<<">::Register(\""<<d->GetTypeName()<<"\") : The box is an adaptor, inserting it in adaptors map ..."<<std::endl);   
 	
 	TypeInfo typein = d->GetInputDescriptor("In")->GetTypeInfo();
 	TypeInfo typeout = d->GetOutputDescriptor("Out")->GetTypeInfo();
@@ -861,7 +876,7 @@ namespace bbtk
     // If it is a default adaptor, also register it in the adaptors map
     else if ( d->GetKind() == BlackBoxDescriptor::DEFAULT_GUI)
       {
-	bbtkDebugMessage("Kernel",8,"Package<"<<GetName()<<">::RegisterBlackBox(\""<<d->GetTypeName()<<"\") : The box is a widget adaptor, inserting it in adaptors map ..."<<std::endl);   
+	bbtkDebugMessage("kernel",8,"Package<"<<GetName()<<">::Register(\""<<d->GetTypeName()<<"\") : The box is a widget adaptor, inserting it in adaptors map ..."<<std::endl);   
 	
 	TypeInfo typeout = d->GetOutputDescriptor("Out")->GetTypeInfo();
 	DataInfo infoin(typeid(void),"");
@@ -889,20 +904,20 @@ namespace bbtk
       }
     
 
-    bbtkDebugDecTab("Kernel",8);
+    bbtkDebugDecTab("kernel",8);
    
     return true;
   }
   //==========================================================================
   
   //===================================================================
-  void Package::CheckBoxes() const
+  void Package::Check() const
   {
     bbtkMessage("debug",1,"****** Checking Package "<<(void*)this
 		<<" ["<<GetName()<<"]"<<std::endl);
-    BlackBoxMapType::const_iterator i;
-    for (i=mBlackBoxMap.begin();
-	 i!=mBlackBoxMap.end();
+    DescriptorMapType::const_iterator i;
+    for (i=mDescriptorMap.begin();
+	 i!=mDescriptorMap.end();
 	 ++i) 
       {
 	i->second->Check(true);
@@ -915,39 +930,40 @@ namespace bbtk
 
   //==========================================================================
   /// Changes the name of a black box type
-  void Package::ChangeBlackBoxName( const std::string& oldname, const std::string& newname )
+  void Package::ChangeDescriptorName( const std::string& oldname, const std::string& newname )
   { 
-    bbtkDebugMessageInc("Kernel",8,"Package<"<<GetName()<<">::ChangeBlackBoxName(\""<<oldname<<"\",\""<<newname<<"\")"<<std::endl);
+    bbtkDebugMessageInc("kernel",8,"Package<"<<GetName()
+			<<">::ChangeDescriptorName(\""<<oldname
+			<<"\",\""<<newname<<"\")"<<std::endl);
     // Looking into the bb map
-    BlackBoxMapType::iterator i = mBlackBoxMap.find(oldname);
-    if (i == mBlackBoxMap.end())  
+    DescriptorMapType::iterator i = mDescriptorMap.find(oldname);
+    if (i == mDescriptorMap.end())  
       {
-         bbtkDebugDecTab("Kernel",8);
-         bbtkError("ChangeBlackBoxName : The package <"<<GetName()<<"> does not contains the black box <"<<oldname<<">");
+         bbtkDebugDecTab("kernel",8);
+         bbtkError("ChangeDescriptorName : The package <"<<GetName()<<"> does not contains the black box <"<<oldname<<">");
       }
 
     i->second->SetTypeName(newname);
-    mBlackBoxMap[newname] = i->second;
-    mBlackBoxMap.erase(i);
+    mDescriptorMap[newname] = i->second;
+    mDescriptorMap.erase(i);
 
-    bbtkDebugDecTab("Kernel",8);    
+    bbtkDebugDecTab("kernel",8);    
   }
   //==========================================================================
 
 
 
   //==========================================================================
-  /// Displays the list of black boxes of the package
-  void Package::PrintBlackBoxes(bool description, bool adaptors) const
+  void Package::PrintHelpListDescriptors(bool description, bool adaptors) const
   {
     unsigned int lmax = 0;
     std::vector<std::string> names;
     std::vector<std::string> kinds;
     std::vector<std::string> descrs;
 
-    BlackBoxMapType::const_iterator i;
-    for (i=mBlackBoxMap.begin();
-	 i!=mBlackBoxMap.end();
+    DescriptorMapType::const_iterator i;
+    for (i=mDescriptorMap.begin();
+	 i!=mDescriptorMap.end();
 	 ++i) 
       {
 	if ( adaptors || 
@@ -991,15 +1007,15 @@ namespace bbtk
       {
 	std::string space;
 	space.append(lmax - ni->size() - ci->size(),' ');
-	bbtkMessage("Help",1,*ni << space << *ci );
+	bbtkMessage("help",1,*ni << space << *ci );
 	std::string d(*di);
 	unsigned int dmax = 75 - lmax;
 	//	while (d.size() > dmax ) 
 	//  {
 	if (d.size()>dmax) 
-	  bbtkMessage("Help",1,d.substr(0,dmax) << "..." << std::endl);
+	  bbtkMessage("help",1,d.substr(0,dmax) << "..." << std::endl);
 	else 
-	  bbtkMessage("Help",1,d << std::endl);
+	  bbtkMessage("help",1,d << std::endl);
 	//    d = d.substr(dmax,d.size());
 	//  }
       }
@@ -1009,30 +1025,30 @@ namespace bbtk
 
   //==========================================================================
   /// Displays the list of adaptors of the package
-  void Package::PrintAdaptors(bool description) const
+  void Package::PrintHelpListAdaptors(bool description) const
   {
-    BlackBoxMapType::const_iterator i;
-    for (i=mBlackBoxMap.begin();
-	 i!=mBlackBoxMap.end();
+    DescriptorMapType::const_iterator i;
+    for (i=mDescriptorMap.begin();
+	 i!=mDescriptorMap.end();
 	 ++i) 
       {
 	if ( i->second->GetKind() != BlackBoxDescriptor::STANDARD ) 
 	  {
-	    bbtkMessage("Help",1,
+	    bbtkMessage("help",1,
 			"  "<<i->second->GetTypeName());
 	    if ( i->second->GetKind() == 
 		 BlackBoxDescriptor::DEFAULT_ADAPTOR )
 	      {
-		bbtkMessage("Help",1,
+		bbtkMessage("help",1,
 			    " [default]");
 	      }  
 	    if (description) 
 	      {
-		bbtkMessage("Help",1,
+		bbtkMessage("help",1,
 			    " : "<<i->second->GetDescription());
 
 	      } 
-	    bbtkMessage("Help",1,std::endl);
+	    bbtkMessage("help",1,std::endl);
 	  }
       } 
     /*
@@ -1041,36 +1057,37 @@ namespace bbtk
 	 i!=mAdaptorMap.end();
 	 ++i) 
       {
-	bbtkMessage("Help",1,
+	bbtkMessage("help",1,
 		    "  "<<i->second->GetTypeName());
 	if (detail_level>0) 
 	  {
-	    bbtkMessage("Help",1,
+	    bbtkMessage("help",1,
 			" : "<<i->second->GetDescription());
   
 	  } 
-	bbtkMessage("Help",1,std::endl);
+	bbtkMessage("help",1,std::endl);
       }
     */ 
   }
   //==========================================================================
 
   //==========================================================================
-  /// Prints help on a black box
-  void Package::HelpBlackBox(const std::string& name, bool full) const
+  /// Prints help on a black box descriptor
+  void Package::PrintHelpDescriptor(const std::string& name, bool full) const
   {
-    bbtkDebugMessageInc("Kernel",8,"Package<"<<GetName()<<">::HelpBlackBox(\""
+    bbtkDebugMessageInc("kernel",8,"Package<"<<GetName()
+			<<">::PrintHelpDescriptor(\""
 			<<name<<"\")"<<bbtkendl);
 
-    BlackBoxMapType::const_iterator i = mBlackBoxMap.find(name);
-    if (i == mBlackBoxMap.end())  
+    DescriptorMapType::const_iterator i = mDescriptorMap.find(name);
+    if (i == mDescriptorMap.end())  
       {
-	bbtkDebugDecTab("Kernel",8);
+	bbtkDebugDecTab("kernel",8);
 	bbtkError("The package <"<<GetName()<<"> does not contains the black box <"<<name<<">");
       }
-    //    bbtkMessage("Help",1,"["<<GetName()<<"] ");
+    //    bbtkMessage("help",1,"["<<GetName()<<"] ");
     i->second->GetHelp(full);
-    bbtkDebugDecTab("Kernel",8);
+    bbtkDebugDecTab("kernel",8);
 
   }
   //==========================================================================
@@ -1078,18 +1095,19 @@ namespace bbtk
 
   //==========================================================================
   /// Returns true iff the package contains the box of name boxname
-  bool Package::ContainsBlackBox(const std::string& name) const 
+  bool Package::ContainsDescriptor(const std::string& name) const 
   {
-    bbtkDebugMessageInc("Kernel",8,"Package<"<<GetName()<<">::HelpBlackBox(\""
+    bbtkDebugMessageInc("kernel",8,"Package<"<<GetName()
+			<<">::ContainsDescriptor(\""
 			<<name<<"\")"<<bbtkendl);
     
-    BlackBoxMapType::const_iterator i = mBlackBoxMap.find(name);
-    if (i == mBlackBoxMap.end())  
+    DescriptorMapType::const_iterator i = mDescriptorMap.find(name);
+    if (i == mDescriptorMap.end())  
     {
-      bbtkDebugDecTab("Kernel",8);
+      bbtkDebugDecTab("kernel",8);
       return false;
     }
-    bbtkDebugDecTab("Kernel",8);
+    bbtkDebugDecTab("kernel",8);
     return true;
   }
   //==========================================================================
@@ -1106,9 +1124,11 @@ namespace bbtk
 			       int level,
 			       bool relative_link ) const
   {
-    bbtkDebugMessageInc("Kernel",9,"Package<"<<GetName()<<">::CreateHtmlPage(\""
+    bbtkDebugMessageInc("kernel",9,"Package<"<<GetName()<<">::CreateHtmlPage(\""
 			<<filename<<"\")"<<bbtkendl);
 
+//std::cout<<"JCP bbtkPackage.cxx void Package::CreateHtmlPage() ln 1133"<<std::endl;
+
     //---------------------
     // Open output file
     std::ofstream s;
@@ -1199,7 +1219,7 @@ namespace bbtk
 	  << bbtk::GetVersion() << "</TD></TR>\n";
 	s << "</TABLE>\n";
       }
-
+//std::cout<<"JCP bbtkPackage.cxx void Package::CreateHtmlPage() ln 1225"<<std::endl;
     //-------------------
     // Table of contents
     // Black boxes list
@@ -1209,65 +1229,65 @@ namespace bbtk
 
     s << "<p><TABLE cellspacing=0  cellpadding=3>\n";
 
-    BlackBoxMapType::const_iterator i;
-    for (i=mBlackBoxMap.begin(); i!=mBlackBoxMap.end(); ++i) 
-      {
-	if ( i->second->GetKind() != BlackBoxDescriptor::STANDARD) 
-	  continue;
+    DescriptorMapType::const_iterator i;
+//std::cout<<"JCP bbtkPackage.cxx void Package::CreateHtmlPage() ln 1236"<<std::endl;
+    for (i=mDescriptorMap.begin(); i!=mDescriptorMap.end(); ++i) {
+		if ( i->second->GetKind() != BlackBoxDescriptor::STANDARD) 
+			continue;
 	
-	std::string name = i->second->GetTypeName();
-	Utilities::html_format(name);
-	std::string descr = i->second->GetDescription();
-	//Utilities::html_format(descr);
-
-        s << "<TR>";
-	s << "<TD style='vertical-align: top;'>";
-	s << "&nbsp;&nbsp;&nbsp;<a name=\"toc_"<<name
-	  <<"\" href=\"#"<<name<<"\">"
-	  <<name<<"</a>";
-	s << "</TD> ";
-	s << " <TD style='vertical-align: top;'>" << descr << " </TD>";
-        s << "</TR>\n";
-      }    
-    s << "</TABLE>\n";
-    
+		std::string name = i->second->GetTypeName();
+		Utilities::html_format(name);
+		std::string descr = i->second->GetDescription();
+		//Utilities::html_format(descr);
+//std::cout<<"JCP bbtkPackage.cxx void Package::CreateHtmlPage() ln 1246"<<std::endl;
+		s << "<TR>";
+		s << "<TD style='vertical-align: top;'>";
+		s << "&nbsp;&nbsp;&nbsp;<a name=\"toc_"<<name
+		<<"\" href=\"#"<<name<<"\">"
+		<<name<<"</a>";
+		s << "</TD> ";
+		s << " <TD style='vertical-align: top;'>" << descr << " </TD>";
+		s << "</TR>\n";
+		}    
+		s << "</TABLE>\n";
+
+
+		s << "</ul>\n";
+		s << "</div>\n";
     
-    s << "</ul>\n";
-    s << "</div>\n";
-    
-    //-------------------
-    // Adaptors list
-    if (mAdaptorMap.size()>0) 
-      {
-	//  s << "<div class=\"contents\">\n";
-	s << "<p><b> Adaptors : </b>\n";
-	s << "<ul>\n";
-
-	//    BlackBoxMapType::const_iterator i;
-	s << "<p><TABLE cellspacing=0  cellpadding=3>\n";
-	for (i=mBlackBoxMap.begin(); i!=mBlackBoxMap.end();++i) 
-	  {
-	    if ( i->second->GetKind() == BlackBoxDescriptor::STANDARD) 
-	      continue;
-    
-	    std::string name = i->second->GetTypeName();
-	    Utilities::html_format(name);
-	    std::string descr = i->second->GetDescription();
+		//-------------------
+		// Adaptors list
+		if (mAdaptorMap.size()>0) 
+		{
+			//  s << "<div class=\"contents\">\n";
+			s << "<p><b> Adaptors : </b>\n";
+			s << "<ul>\n";
+//std::cout<<"JCP bbtkPackage.cxx void Package::CreateHtmlPage() ln 1268"<<std::endl;
+			//    DescriptorMapType::const_iterator i;
+			s << "<p><TABLE cellspacing=0  cellpadding=3>\n";
+			for (i=mDescriptorMap.begin(); i!=mDescriptorMap.end();++i) 
+			{
+				if ( i->second->GetKind() == BlackBoxDescriptor::STANDARD) 
+					continue;
     
-	    s << "<TR>";
-	    s << "<TD style='vertical-align: top;'>";
-	    s << "&nbsp;&nbsp;&nbsp;<a name=\"toc_"<<name
-	      <<"\" href=\"#"<<name<<"\">"
-	      <<name<<"</a>";
-	    s << "</TD> ";
-	    s << " <TD style='vertical-align: top;'>" << descr << " </TD>";
-	    s << "</TR>\n";
-	  }    
-	s << "</TABLE>\n";
-
-	s << "</ul>\n";
-	s << "</div>\n";
-      }
+				std::string name = i->second->GetTypeName();
+				Utilities::html_format(name);
+				std::string descr = i->second->GetDescription();
+		    
+				s << "<TR>";
+				s << "<TD style='vertical-align: top;'>";
+				s << "&nbsp;&nbsp;&nbsp;<a name=\"toc_"<<name
+				  <<"\" href=\"#"<<name<<"\">"
+				  <<name<<"</a>";
+				s << "</TD> ";
+				s << " <TD style='vertical-align: top;'>" << descr << " </TD>";
+				s << "</TR>\n";
+			}    
+			s << "</TABLE>\n";
+
+			s << "</ul>\n";
+			s << "</div>\n";
+		}
     
     
     //  s << "<div class=\"node\">\n";
@@ -1286,23 +1306,23 @@ namespace bbtk
     //-------------------
     // Computes output directory from filename to pass it to 
     // BlackBoxDescriptor::InsertHtmlHelp
-    std::string dir;
+		std::string dir;
 
-    std::string::size_type slash_position = filename.find_last_of("/\\");
+		std::string::size_type slash_position = filename.find_last_of("/\\");
 
 
-	if (slash_position != std::string::npos) {
-      if (slash_position == 0)
-         slash_position = 1;  
-      dir = filename.substr(0,slash_position);
-    }
+		if (slash_position != std::string::npos) {
+			if (slash_position == 0)
+			 slash_position = 1;  
+			dir = filename.substr(0,slash_position);
+		}
 
-    for (i=mBlackBoxMap.begin();
-	 i!=mBlackBoxMap.end();
-	 ++i) 
-      {
-	i->second->InsertHtmlHelp(s,detail,level,dir,relative_link);
-      }    
+		for (i=mDescriptorMap.begin();
+		 i!=mDescriptorMap.end();
+		 ++i) 
+		{
+			i->second->InsertHtmlHelp(s,detail,level,dir,relative_link);
+		}    
 
     //----------------------
     // Footer 
@@ -1322,7 +1342,7 @@ namespace bbtk
     //----------------------
 
     // End
-    bbtkDebugDecTab("Kernel",9);
+    bbtkDebugDecTab("kernel",9);
   }
   //==========================================================================
   
@@ -1337,7 +1357,7 @@ namespace bbtk
   std::string Package::GetObjectInfo() const 
   {
     std::stringstream i;
-    i << "  - "<<mBlackBoxMap.size() << " boxes" << std::endl;
+    i << "  - "<<mDescriptorMap.size() << " boxes" << std::endl;
     if (mDynamicLibraryHandler) 
       {
 	i<< "  - Loaded from dynamic library"<<std::endl;
@@ -1368,8 +1388,8 @@ namespace bbtk
     size_t s = Superclass::GetObjectRecursiveSize();
     s += Package::GetObjectInternalSize();
     
-    BlackBoxMapType::const_iterator i;
-    for (i = mBlackBoxMap.begin(); i!=mBlackBoxMap.end(); ++i )
+    DescriptorMapType::const_iterator i;
+    for (i = mDescriptorMap.begin(); i!=mDescriptorMap.end(); ++i )
       {
 	s += i->second->GetObjectRecursiveSize();
       }