X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkFactory.cxx;h=368275afb8d5c07af52361ac09576621246b9300;hb=8ba18df584ba0a409fb042663be9fa76ccb0e0b0;hp=d541db35b9203e89b984a63daa7c2dd1a7760eb5;hpb=12f2166f201f4e5a99c9c7876dadd09da81bfb51;p=bbtk.git

diff --git a/kernel/src/bbtkFactory.cxx b/kernel/src/bbtkFactory.cxx
index d541db3..368275a 100644
--- a/kernel/src/bbtkFactory.cxx
+++ b/kernel/src/bbtkFactory.cxx
@@ -106,7 +106,6 @@ namespace bbtk
                               std::string pkgname,
                               std::string path)
   {
-    
     Package::Pointer p = Package::CreateFromDynamicLibrary(libname,
 							   pkgname,
 							   path);
@@ -125,8 +124,7 @@ namespace bbtk
 	mPackageMap[pkgname] = p;
 	return true;
       }
-    return false;
-    
+    return false;    
   }
   
   //===================================================================
@@ -148,7 +146,6 @@ namespace bbtk
   void Factory::LoadPackage( const std::string& name )
   {
 	  
-	  
   // Note : in the following :
   // name : the user supplied name
   //      - abreviated name    e.g.       pkg   pkg.so   libbpkg   libbbpkg.so
@@ -157,9 +154,7 @@ namespace bbtk
   //          same for Windows, with      c:, d: ...
   //
   // lastname : string before the last / (if any), or user supplied name
-	  
-	 
-	  
+	  	  
 	if(name != ""){
 		bbtkDebugMessageInc("kernel",7,"Factory::LoadPackage(\""<<name<<"\")"<<std::endl);
 		bbtkMessage("debug",1,"Factory::LoadPackage(\""<<name<<"\")"<<std::endl);
@@ -186,7 +181,6 @@ namespace bbtk
 //			std::cout << (*it).first << " ";
 //		std::cout << std::endl;
 
-		
 		if (iUnload != mPackageMap.end())
 		{
 		  bbtkMessage("output",2,"["<< pkgname <<"] already loaded" << std::endl);
@@ -213,7 +207,7 @@ namespace bbtk
 			  return;
 		   }
 
-		  // std::string path = Utilities::ExpandLibName(upath, false);
+        // std::string path = Utilities::ExpandLibName(upath, false);
 
 		   std::string path = Utilities::ExpandLibName(name,false); // keep last item, here.
 		   if (path != "")
@@ -228,24 +222,18 @@ namespace bbtk
 			  // The following is *NOT* a debug time message :
 			  // It's a user intended message.
 			  // Please don't remove it.
-			bbtkMessage("output",3,"   [" <<libname 
-				<<"] : doesn't exist" <<std::endl);
-			  }
-			  else
-			  {
+				bbtkMessage("output",3,"   [" << libname <<"] : doesn't exist" <<std::endl);
+			} else {
 				 ok = DoLoadPackage( libname, pkgname, path);         
-			  }
-		   }
-		   else
-		   {
+			}
+		   } else {
 			  bbtkError("Path ["<<upath<<"] doesn't exist");
 			  return;
 		   }
-		}
-		else     // ----------------------------------------------------- iterate on the paths  
+		} else     // ----------------------------------------------------- iterate on the paths  
 		{
 
-		std::string path = ".";
+        std::string path = ".";
 		package_paths = ConfigurationFile::GetInstance().Get_package_paths();
 		std::vector<std::string>::iterator i;
 		for (i=package_paths.begin();i!=package_paths.end();++i)
@@ -280,7 +268,6 @@ namespace bbtk
 			foundFile = true; 
 
 		  // Try to Load the library
-
 			ok = DoLoadPackage( libname, pkgname, path);
 			if (ok)
 			{
@@ -288,7 +275,6 @@ namespace bbtk
 			}
 		break; // we stop iterating even if error : have to signal it to user
 		} //------------------ // end for ( package_paths.begin();i!=package_paths.end() )
-
 	}
 
 		if( !ok )  // nothing was loaded
@@ -317,9 +303,6 @@ namespace bbtk
 		}	
 		bbtkMessage("output",2,"[" << libname << "] loaded" << std::endl);
 	}
-
-    
-
   }
 
   //===================================================================
@@ -674,7 +657,7 @@ namespace bbtk
       } 
     
     bbtkDebugDecTab("kernel",7);
-    return b; 
+    return b;
   }
   //===================================================================