*** empty log message ***

[bbtk.git] / kernel / src / bbtkException.h

diff --git a/kernel/src/bbtkException.h b/kernel/src/bbtkException.h
index 9c5c6ae45723c10543dff733af4a669487611e76..d7ea3f75d31e47ca9189aeeae3782105f7394e7c 100644 (file)
--- a/kernel/src/bbtkException.h
+++ b/kernel/src/bbtkException.h
@@ -1,21 +1,34 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbtkException.h,v $
   Language:  C++
-  Date:      $Date: 2008/01/22 15:02:00 $
-  Version:   $Revision: 1.1 $
-                                                                                
-  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
-  l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details.
-                                                                                
-     This software is distributed WITHOUT ANY WARRANTY; without even
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notices for more information.
-                                                                                
+  Date:      $Date: 2008/10/17 08:18:13 $
+  Version:   $Revision: 1.4 $
 =========================================================================*/
 
+/* ---------------------------------------------------------------------
+
+* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
+* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
+*
+*  This software is governed by the CeCILL-B license under French law and 
+*  abiding by the rules of distribution of free software. You can  use, 
+*  modify and/ or redistribute the software under the terms of the CeCILL-B 
+*  license as circulated by CEA, CNRS and INRIA at the following URL 
+*  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+*  or in the file LICENSE.txt.
+*
+*  As a counterpart to the access to the source code and  rights to copy,
+*  modify and redistribute granted by the license, users are provided only
+*  with a limited warranty  and the software's author,  the holder of the
+*  economic rights,  and the successive licensors  have only  limited
+*  liability. 
+*
+*  The fact that you are presently reading this means that you have had
+*  knowledge of the CeCILL-B license and that you accept its terms.
+* ------------------------------------------------------------------------ */                                                                         
+
+
 
 /**
  *  \file 
@@ -46,10 +59,10 @@ namespace bbtk
   {
   public:
     Exception(const std::string& object,
-             const std::string& file,
+             const std::string& source_file,
              const std::string& message) throw()
       : mObject(object),
-       mFile(file),
+       mSourceFile(source_file),
        mMessage(message)
     {}
     ~Exception() throw() {}
@@ -59,15 +72,16 @@ namespace bbtk
       int lev = bbtk::MessageManager::GetMessageLevel("Error");
       if (lev > 0) {
        std::cerr << "* OBJECT : " <<mObject<<std::endl;
-       std::cerr << "* FILE   : " <<mFile<<std::endl;
+       std::cerr << "* FILE   : " <<mSourceFile<<std::endl;
       }
     }
+    //const std::string& GetMessage() const { return mMessage; }
     const std::string& GetObject() const { return mObject; }
-    const std::string& GetFile() const { return mFile; }
-    const std::string& GetMessage() const { return mMessage; }
+    const std::string& GetSourceFile() const { return mSourceFile; }
+    const std::string& GetErrorMessage() const { return mMessage; }
   private:
     std::string mObject;
-    std::string mFile;
+    std::string mSourceFile;
     std::string mMessage;
   };