PR: corrections residuelles des anomalies du merge cvs

[modules/kernel.git] / src / RessourcesCatalog / SALOME_RessourcesCatalog_impl.cxx

diff --git a/src/RessourcesCatalog/SALOME_RessourcesCatalog_impl.cxx b/src/RessourcesCatalog/SALOME_RessourcesCatalog_impl.cxx
index 2d9806ba96d6e0b447d1daa4e389363281837f48..cc819e49563ccdce6170ae1893c6262d18abc14e 100644 (file)
--- a/src/RessourcesCatalog/SALOME_RessourcesCatalog_impl.cxx
+++ b/src/RessourcesCatalog/SALOME_RessourcesCatalog_impl.cxx
@@ -1,14 +1,37 @@
-using namespace std;
-// File: SALOME_RessourcesCatalog_impl.cxx
-// Created: Mon Sep 10 2001
-// Author: Estelle Deville
-// Project: SALOME
-// Copyright : CEA/DEN/DMSS/LGLS
-// $Header $
+//  SALOME RessourcesCatalog : implementation of catalog resources parsing (SALOME_ModuleCatalog.idl)
+//
+//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
+// 
+//  This library is free software; you can redistribute it and/or 
+//  modify it under the terms of the GNU Lesser General Public 
+//  License as published by the Free Software Foundation; either 
+//  version 2.1 of the License. 
+// 
+//  This library is distributed in the hope that it will be useful, 
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+//  Lesser General Public License for more details. 
+// 
+//  You should have received a copy of the GNU Lesser General Public 
+//  License along with this library; if not, write to the Free Software 
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+// 
+//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//
+//
+//
+//  File   : SALOME_RessourcesCatalog_impl.cxx
+//  Author : Estelle Deville
+//  Module : SALOME
 
+using namespace std;
 #include "SALOME_RessourcesCatalog_impl.hxx"
 #include <fstream>
 
+#include "Utils_ExceptHandlers.hxx"
+UNEXPECT_CATCH(RC_NotFound, SALOME_RessourcesCatalog::NotFound);
+
 //----------------------------------------------------------------------
 // Function : SALOME_RessourcesCatalogImpl
 // Purpose  : Constructor 
@@ -75,6 +98,7 @@ SALOME_RessourcesCatalog::ListOfContainerType*
 SALOME_RessourcesCatalogImpl::GetContainerTypeList(const char* computer) 
                               throw(SALOME_RessourcesCatalog::NotFound)
 {
+  Unexpect aCatch(RC_NotFound);
   MESSAGE("Begin of GetContainerTypeList");
   SALOME_RessourcesCatalog::ListOfContainerType_var _list = 
     new SALOME_RessourcesCatalog::ListOfContainerType;
@@ -129,6 +153,7 @@ SALOME_RessourcesCatalogImpl::GetComputerInfo(const char* computer)
                             throw(SALOME_RessourcesCatalog::NotFound)
 {
   MESSAGE("Begin of GetComputerInfo");
+  Unexpect aCatch(RC_NotFound);
   SALOME_RessourcesCatalog::computer_info_var _computer_info = 
     new SALOME_RessourcesCatalog::computer_info;
 
@@ -233,7 +258,7 @@ SALOME_RessourcesCatalogImpl::_parseArguments(int argc, char **argv,
 
       if (strcmp(argv[ind],"-help") == 0)
        {
-         INFOS( "Usage: " << argv[0] << " -common 'path to ressources catalog' -ORBInitRef NameService=corbaname::localhost");
+         MESSAGE( "Usage: " << argv[0] << " -common 'path to ressources catalog' -ORBInitRef NameService=corbaname::localhost");
            _return_value = false ;
        }
       if (strcmp(argv[ind],"-common") == 0)