X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fcomm%2FkxClient%2Fmain.cpp;h=5fe1d0cb751849eeb739159471eadcda29f44f83;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=63b03191115d334a9e12ac912abe7081f3890c8f;hpb=4e12ac57e93c052f716a6305ad8fc099c45899d1;p=anna.git

diff --git a/example/comm/kxClient/main.cpp b/example/comm/kxClient/main.cpp
index 63b0319..5fe1d0c 100644
--- a/example/comm/kxClient/main.cpp
+++ b/example/comm/kxClient/main.cpp
@@ -1,37 +1,9 @@
-// ANNA - Anna is Not 'N' 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 //
 
 
 /*
@@ -65,35 +37,37 @@ public:
    class ClientSocketAllocator {
    public:
       static comm::INetAddress* st_inetAddress;      
-      static comm::ClientSocket* create ()  throw () { return new comm::ClientSocket (*st_inetAddress); }
-      static void destroy (comm::ClientSocket* clientSocket) throw () { delete clientSocket; }
+      static comm::ClientSocket* create ()  { return new comm::ClientSocket (*st_inetAddress); }
+      static void destroy (comm::ClientSocket* clientSocket) { delete clientSocket; }
    };   
    
 private:
+   using comm::Communicator::eventBreakConnection;
+
    test::Response a_response;   
    test::Request a_request;
    comm::INetAddress a_inetAddress;
    Recycler <comm::ClientSocket, ClientSocketAllocator> a_clientSockets;
 
-   void do_initialize () throw (RuntimeException);
+   void do_initialize () noexcept(false);
    
-   void eventReceiveMessage (comm::ClientSocket&, const comm::Message&) throw (RuntimeException);
-   void eventBreakConnection (const comm::ClientSocket&) throw ();
-   void eventUser (const char* id, const void* context) throw ();   
+   void eventReceiveMessage (comm::ClientSocket&, const comm::Message&) noexcept(false);
+   void eventBreakConnection (const comm::ClientSocket&) ;
+   void eventUser (const char* id, const void* context) ;   
 };
 
 class KXClient : public anna::comm::Application {
 public:
    KXClient ();
       
-   const test::Menu& getMenu () const throw () { return a_menu; }
+   const test::Menu& getMenu () const { return a_menu; }
    
 private:
    MyCommunicator a_communicator;
    test::Menu a_menu;
 
-   void initialize () throw (RuntimeException);
-   void run () throw (RuntimeException);    
+   void initialize () noexcept(false);
+   void run () noexcept(false);    
 };
 
 using namespace std;
@@ -133,13 +107,13 @@ KXClient::KXClient () :
 }
 
 void KXClient::initialize () 
-   throw (RuntimeException)
+   noexcept(false)
 {
    a_communicator.attach (&a_menu);
 }
 
 void KXClient::run ()
-   throw (RuntimeException)
+   noexcept(false)
 {   
    a_menu.paint ();
    a_communicator.accept ();
@@ -149,7 +123,7 @@ void KXClient::run ()
 // Crea la direccion a la que se conectaran los ClientSocket para enviar las peticiones.
 //--------------------------------------------------------------------------------------------
 void MyCommunicator::do_initialize () 
-   throw (RuntimeException)
+   noexcept(false)
 {
    CommandLine& cl (CommandLine::instantiate ());    
 
@@ -166,7 +140,7 @@ void MyCommunicator::do_initialize ()
 }
 
 void MyCommunicator::eventReceiveMessage (comm::ClientSocket&, const comm::Message& message)
-   throw (RuntimeException)
+   noexcept(false)
 {
    a_response.decode (message.getBody ());
    
@@ -180,7 +154,7 @@ void MyCommunicator::eventReceiveMessage (comm::ClientSocket&, const comm::Messa
 // reutilizar la instancia (no la conexion).
 //-----------------------------------------------------------------------------------------
 void MyCommunicator::eventBreakConnection (const comm::ClientSocket& clientSocket) 
-   throw ()
+   
 {
    a_clientSockets.release (&clientSocket);
 }
@@ -190,7 +164,7 @@ void MyCommunicator::eventBreakConnection (const comm::ClientSocket& clientSocke
 // notifica al comunicador mediante un evento de usuario.
 //-----------------------------------------------------------------------------------------
 void MyCommunicator::eventUser (const char* id, const void* context) 
-   throw ()
+   
 {
    LOGMETHOD (TraceMethod tm ("MyCommunicator", "eventUser", ANNA_FILE_LOCATION));