X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fdbos%2Fworkdir%2Fmain.cpp;h=fa3dbd8765f921b54397a2f57e47df086a33c372;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=522d00c97b7652888d74fd2e6a35c5c9fa8ddaba;hpb=3e258840b15577cb8bda3cdedd0b9b88e16404b3;p=anna.git diff --git a/example/dbos/workdir/main.cpp b/example/dbos/workdir/main.cpp index 522d00c..fa3dbd8 100644 --- a/example/dbos/workdir/main.cpp +++ b/example/dbos/workdir/main.cpp @@ -1,37 +1,9 @@ -// ANNA - Anna is Not Nothingness Anymore -// -// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo -// -// https://bitbucket.org/testillano/anna -// -// 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 Google Inc. 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 // #include @@ -57,7 +29,7 @@ using namespace std; using namespace workdir; -template void message (const char* text, T* tt) throw () { +template void message (const char* text, T* tt) { if (Logger::isActive (Logger::Debug) == false) return; @@ -79,7 +51,7 @@ public: WorkDirectory (); - xml::Node* asXML (xml::Node* parent) const throw (); + xml::Node* asXML (xml::Node* parent) const ; private: typedef vector file_container; @@ -90,17 +62,17 @@ private: filesystem::Directory* a_root; file_container a_files; - void initialize () throw (RuntimeException); - void run () throw (RuntimeException); + void initialize () noexcept(false); + void run () noexcept(false); - void forward (filesystem::Directory*) throw (RuntimeException); - void instantiateOne (filesystem::Directory*) throw (RuntimeException); - void fullCache (filesystem::Directory*, file_container&, const int flags) throw (RuntimeException); - void reuseHoles (filesystem::Directory*, file_container&) throw (RuntimeException); - void destroyObjects (filesystem::Directory* dir, file_container&) throw (RuntimeException); - void clear (file_container&) throw (); + void forward (filesystem::Directory*) noexcept(false); + void instantiateOne (filesystem::Directory*) noexcept(false); + void fullCache (filesystem::Directory*, file_container&, const int flags) noexcept(false); + void reuseHoles (filesystem::Directory*, file_container&) noexcept(false); + void destroyObjects (filesystem::Directory* dir, file_container&) noexcept(false); + void clear (file_container&) ; - static void load (filesystem::Directory* parent, const int maxLevel, const int level = 0) throw (RuntimeException); + static void load (filesystem::Directory* parent, const int maxLevel, const int level = 0) noexcept(false); }; using namespace std; @@ -133,18 +105,18 @@ WorkDirectory::WorkDirectory () : CommandLine& cl (CommandLine::instantiate ()); cl.add ("dir", CommandLine::Argument::Mandatory, "Nombre del directorio a procesar"); - cl.add ("l", CommandLine::Argument::Optional, "Nº máximo de niveles de profundidad"); + cl.add ("l", CommandLine::Argument::Optional, "Numero maximo de niveles de profundidad"); cl.add ("trace", CommandLine::Argument::Optional, "Nivel de trazado"); cl.add ("s", CommandLine::Argument::Mandatory, "Cache size"); } void WorkDirectory::initialize () - throw (RuntimeException) + noexcept(false) { } void WorkDirectory::run () - throw (RuntimeException) + noexcept(false) { LOGMETHOD (TraceMethod tm ("WorkDirectory", "run", ANNA_FILE_LOCATION)); @@ -174,7 +146,7 @@ void WorkDirectory::run () } xml::Node* WorkDirectory::asXML (xml::Node* parent) const - throw () + { xml::Node* result = app::Application::asXML (parent); a_repository.asXML (result); @@ -182,7 +154,7 @@ xml::Node* WorkDirectory::asXML (xml::Node* parent) const } void WorkDirectory::forward (filesystem::Directory* dir) - throw (RuntimeException) + noexcept(false) { cout << "forward: " << dir->getPath () << endl; @@ -210,7 +182,7 @@ void WorkDirectory::forward (filesystem::Directory* dir) * de verdad sea necesario. */ void WorkDirectory::instantiateOne (filesystem::Directory* dir) - throw (RuntimeException) + noexcept(false) { TraceMethod tm ("WorkDirectory", "instantiateOne", ANNA_FILE_LOCATION); @@ -238,7 +210,7 @@ void WorkDirectory::instantiateOne (filesystem::Directory* dir) } void WorkDirectory::fullCache (filesystem::Directory* dir, WorkDirectory::file_container& files, const int flags) - throw (RuntimeException) + noexcept(false) { TraceMethod tm ("WorkDirectory", "fullCache", ANNA_FILE_LOCATION); @@ -274,22 +246,22 @@ void WorkDirectory::fullCache (filesystem::Directory* dir, WorkDirectory::file_c } void WorkDirectory::reuseHoles (filesystem::Directory* dir, WorkDirectory::file_container& files) - throw (RuntimeException) + noexcept(false) { TraceMethod tm ("WorkDirectory", "reuseHoles", ANNA_FILE_LOCATION); - cout << "WorkDirectory::reuseHoles: Invoca dos veces a fullCache para verificar que el tamaño se mantiene la 2ª vez" << endl; + cout << "WorkDirectory::reuseHoles: Invoca dos veces a fullCache para verificar que el tamano se mantiene la segunda vez" << endl; fullCache (dir, files, Flags::Clear); fullCache (dir, files, Flags::Clear); cout << endl; } void WorkDirectory::destroyObjects (filesystem::Directory* dir, WorkDirectory::file_container& files) - throw (RuntimeException) + noexcept(false) { TraceMethod tm ("WorkDirectory", "destroyObjects", ANNA_FILE_LOCATION); - cout << "WorkDirectory::destroyObjects: Carga un directorio distinto, para verificar que destruye los objetos según se dejan de utilizar" << endl; + cout << "WorkDirectory::destroyObjects: Carga un directorio distinto, para verificar que destruye los objetos segun se dejan de utilizar" << endl; filesystem::File* file; filesystem::Directory* other = NULL; @@ -321,7 +293,7 @@ void WorkDirectory::destroyObjects (filesystem::Directory* dir, WorkDirectory::f void WorkDirectory::clear (WorkDirectory::file_container& files) - throw () + { storage::File* file; @@ -347,7 +319,7 @@ void WorkDirectory::clear (WorkDirectory::file_container& files) /*static*/ void WorkDirectory::load (filesystem::Directory* parent, const int maxLevel, const int level) - throw (RuntimeException) + noexcept(false) { if (level == maxLevel) return; @@ -372,8 +344,8 @@ void WorkDirectory::load (filesystem::Directory* parent, const int maxLevel, con } } else { - // Se asociado al parent automáticamente. - filesystem::File* ff = new filesystem::File (parent, name); + //Auto association to the parent: + new filesystem::File (parent, name); } } }