Feature #1774

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

diff --git a/kernel/src/bbtkException.h b/kernel/src/bbtkException.h
index 9c5c6ae45723c10543dff733af4a669487611e76..d99fec59e634805b501dc762c733bf295da5add2 100644 (file)
--- a/kernel/src/bbtkException.h
+++ b/kernel/src/bbtkException.h
@@ -1,21 +1,41 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ #                        pour la SantÈ)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ #  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.
+ # ------------------------------------------------------------------------ */
+
+
 /*=========================================================================
-                                                                                
   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: 2012/11/16 08:49:01 $
+  Version:   $Revision: 1.5 $
 =========================================================================*/
 
+                                                                         
+
+
 
 /**
  *  \file 
@@ -46,10 +66,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 +79,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;
   };