X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=include%2Fanna%2Fcore%2Futil%2FConfiguration.hpp;h=662d38b977050a721f90404c63d0ce40ddf23bd8;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=f08fff855535fa1ef5aa3769f41ced1dda181ce9;hpb=39033fd99e58e994a5e98c1060dcc79e0d81f9c9;p=anna.git

diff --git a/include/anna/core/util/Configuration.hpp b/include/anna/core/util/Configuration.hpp
index f08fff8..662d38b 100644
--- a/include/anna/core/util/Configuration.hpp
+++ b/include/anna/core/util/Configuration.hpp
@@ -1,37 +1,9 @@
-// ANNA - Anna is Not Nothingness Anymore
-//
-// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo
-//
-// http://redmine.teslayout.com/projects/anna-suite
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     *  Neither the name of the copyright holder nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Authors: eduardo.ramos.testillano@gmail.com
-//          cisco.tierra@gmail.com
+// ANNA - Anna is Not Nothingness Anymore                                                         //
+//                                                                                                //
+// (c) Copyright 2005-2015 Eduardo Ramos Testillano & Francisco Ruiz Rayo                         //
+//                                                                                                //
+// See project site at http://redmine.teslayout.com/projects/anna-suite                           //
+// See accompanying file LICENSE or copy at http://www.teslayout.com/projects/public/anna.LICENSE //
 
 
 #ifndef anna_core_util_Configuration_hpp
@@ -56,12 +28,6 @@ class Configuration {
 public:
   static const char* defaultSection;
 
-  /**
-     Constructor.
-     \param className Nombre de la clase usado para registrar en la lista de componentes.
-  */
-  Configuration(const char* className) {;}
-
   /**
      Constructor.
   */
@@ -78,7 +44,7 @@ public:
      @param configFile Ruta completa con el nombre del archivo de configuracion a cargar.
      Cualquier otro archivo procesado anteriormente con esta instancia se perdera.
   */
-  void load(const char* configFile) throw(RuntimeException);
+  void load(const char* configFile) noexcept(false);
 
   /**
     Establece el valor por defecto para una determinada variable, es decir, en caso de que
@@ -92,7 +58,7 @@ public:
     el archivo de configuracion cargado.
   */
   void setDefaultValue(const char* sectionName, const char* variableName, const char* defaultValue)
-  throw(RuntimeException);
+  noexcept(false);
 
   /**
      Devuelve el valor asociada a la variable indicada.
@@ -106,7 +72,7 @@ public:
     @return El valor asociado a la variable. Puede ser NULL.
   */
   const char* getValue(const char* sectionName, const char* variableName, const bool strict = false) const
-  throw(RuntimeException);
+  noexcept(false);
 
   /**
      Devuelve el valor asociada a la variable indicada.
@@ -119,7 +85,7 @@ public:
     @return El valor asociado a la variable.
   */
   int getIntegerValue(const char* sectionName, const char* variableName, const bool strict = false) const
-  throw(RuntimeException);
+  noexcept(false);
 
   /**
      Devuelve el estado de existencia o no de la variable indicada.
@@ -129,7 +95,7 @@ public:
     @return true si la variable existe, y false en otro caso. Solo deberia invocarse despues de
     invocar al metodo #load.
   */
-  bool exists(const char* sectionName, const char* variableName) const throw();
+  bool exists(const char* sectionName, const char* variableName) const ;
 
   /**
      Devuelve la cadena por la que podemos buscar el componente.
@@ -159,16 +125,16 @@ private:
 
   Configuration(const Configuration& other);  // No implementado
 
-  void initialize() throw(RuntimeException) {;}
-  void stop() throw() {;}
+  void initialize() noexcept(false) {;}
+  void stop() {;}
 
-  void removeAll() throw();
+  void removeAll() ;
   bool processSection(const int nline, char* buffer, std::string& currentSection);
-  void processVariable(const int nline, char* buffer, const std::string& currentSection) throw(RuntimeException);
-  VariableEx* createVariable(const std::string& section, const char* variableName) throw();
-  VariableEx* find(const std::string& section, const char* variableName) throw();
+  void processVariable(const int nline, char* buffer, const std::string& currentSection) noexcept(false);
+  VariableEx* createVariable(const std::string& section, const char* variableName) ;
+  VariableEx* find(const std::string& section, const char* variableName) ;
   const VariableEx* find(const std::string& section, const char* variableName) const
-  throw() {
+  {
     return const_cast <Configuration*>(this)->find(section, variableName);
   }