Salome HOME
Updated copyright comment
[modules/kernel.git] / src / DSC / DSC_Basic / DSC_interface.cxx
index 03dce7d23c8f6bac93173e12675a32ccaf435593..3e643bd6e77541b57ab34a268ae8a2c1b54d6a1d 100644 (file)
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2019  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2024  CEA, EDF, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -35,7 +35,7 @@
 #include <sstream>
 #include <stdlib.h>
 
-//#define MYDEBUG
+#include "utilities.h"
 
 Engines_DSC_interface::Engines_DSC_interface() {}
 
@@ -51,9 +51,6 @@ void
 Engines_DSC_interface::add_provides_port(Ports::Port_ptr ref, 
                                  const char* provides_port_name,
                                  Ports::PortProperties_ptr port_prop) 
-throw (Engines::DSC::PortAlreadyDefined,
-       Engines::DSC::NilPort,
-       Engines::DSC::BadProperty) 
 {
   // Method args test
   assert(provides_port_name);
@@ -82,8 +79,6 @@ void
 Engines_DSC_interface::add_uses_port(const char* repository_id, 
                              const char* uses_port_name,
                              Ports::PortProperties_ptr port_prop) 
-throw (Engines::DSC::PortAlreadyDefined,
-       Engines::DSC::BadProperty) 
 {
   // Method args test
   // Note : We can't be shure that repository id
@@ -113,9 +108,6 @@ throw (Engines::DSC::PortAlreadyDefined,
 Ports::Port_ptr
 Engines_DSC_interface::get_provides_port(const char* provides_port_name,
                                  const CORBA::Boolean connection_error) 
-  throw (Engines::DSC::PortNotDefined,
-         Engines::DSC::PortNotConnected, 
-         Engines::DSC::BadPortType) 
 {
   // Method arg test
   assert(provides_port_name);
@@ -148,9 +140,6 @@ Engines_DSC_interface::get_provides_port(const char* provides_port_name,
 
 Engines::DSC::uses_port * 
 Engines_DSC_interface::get_uses_port(const char* uses_port_name) 
-  throw (Engines::DSC::PortNotDefined,
-         Engines::DSC::PortNotConnected,
-         Engines::DSC::BadPortType) 
 {
   // Method arg test
   assert(uses_port_name);
@@ -165,9 +154,10 @@ Engines_DSC_interface::get_uses_port(const char* uses_port_name)
     Engines::DSC::BadPortType BPT;
     BPT.expected = CORBA::string_dup("Expected a uses port");
     BPT.received = CORBA::string_dup((std::string("Received a provides/none port : ")+uses_port_name).c_str());
-#ifdef MYDEBUG
-   std::cout << "---- DSC_Interface : MARK 1 ---- exception : " << uses_port_name << "----" << std::endl;
-#endif
+
+    if (SALOME::VerbosityActivated())
+      std::cout << "---- DSC_Interface : MARK 1 ---- exception : " << uses_port_name << "----" << std::endl;
+
     throw BPT;
   }
 
@@ -176,19 +166,18 @@ Engines_DSC_interface::get_uses_port(const char* uses_port_name)
     rtn_port = new Engines::DSC::uses_port(my_ports[uses_port_name]->uses_port_refs);
   }
   else
-    {
-#ifdef MYDEBUG
-   std::cout << "---- DSC_Interface : MARK 2 ---- exception : " << uses_port_name << "----" << std::endl;
-#endif
+  {
+    if (SALOME::VerbosityActivated())
+      std::cout << "---- DSC_Interface : MARK 2 ---- exception : " << uses_port_name << "----" << std::endl;
+
     throw Engines::DSC::PortNotConnected();
-    }
+  }
   
   return rtn_port;
 }
 
 void
 Engines_DSC_interface::connect_provides_port(const char* provides_port_name)
-    throw (Engines::DSC::PortNotDefined)
 {
   // Method arg test
   assert(provides_port_name);
@@ -213,9 +202,6 @@ Engines_DSC_interface::connect_provides_port(const char* provides_port_name)
 void
 Engines_DSC_interface::connect_uses_port(const char* uses_port_name,
                                          Ports::Port_ptr provides_port_ref) 
-  throw (Engines::DSC::PortNotDefined,
-         Engines::DSC::BadPortType,
-         Engines::DSC::NilPort)
 {
   // Method arg test
   assert(uses_port_name);
@@ -264,7 +250,6 @@ Engines_DSC_interface::connect_uses_port(const char* uses_port_name,
 
 CORBA::Boolean
 Engines_DSC_interface::is_connected(const char* port_name) 
-  throw (Engines::DSC::PortNotDefined) 
 {
   CORBA::Boolean rtn = false;
 
@@ -285,8 +270,6 @@ Engines_DSC_interface::is_connected(const char* port_name)
 void
 Engines_DSC_interface::disconnect_provides_port(const char* provides_port_name,
                                         const Engines::DSC::Message message)
-throw (Engines::DSC::PortNotDefined,
-       Engines::DSC::PortNotConnected)
 {
   // Method args test
   assert(provides_port_name);
@@ -313,9 +296,6 @@ void
 Engines_DSC_interface::disconnect_uses_port(const char* uses_port_name,
                                     Ports::Port_ptr provides_port_ref,
                                     const Engines::DSC::Message message)
-throw (Engines::DSC::PortNotDefined,
-       Engines::DSC::PortNotConnected,
-       Engines::DSC::BadPortReference) 
 {
   // Method args test
   assert(uses_port_name);
@@ -333,7 +313,7 @@ throw (Engines::DSC::PortNotDefined,
   if (my_ports[uses_port_name]->connection_nbr > 0) {
     CORBA::Long port_index = -1;
     CORBA::ULong seq_length = my_ports[uses_port_name]->uses_port_refs.length(); 
-    for(int i = 0; i < seq_length; i++)
+    for(int i = 0; i < (int)seq_length; i++)
     {
       if (my_ports[uses_port_name]->uses_port_refs[i]->_is_equivalent(provides_port_ref))
       {
@@ -351,7 +331,7 @@ throw (Engines::DSC::PortNotDefined,
 
     int index_ancien = 0;
     int index_nouveau = 0;
-    for(;index_ancien < seq_length;) {
+    for(;index_ancien < (int)seq_length;) {
       if (index_ancien == port_index) 
       {
         // Rien a faire !
@@ -380,7 +360,6 @@ throw (Engines::DSC::PortNotDefined,
 
 Ports::PortProperties_ptr
 Engines_DSC_interface::get_port_properties(const char* port_name) 
-  throw (Engines::DSC::PortNotDefined) 
 {
   Ports::PortProperties_ptr rtn_properties = Ports::PortProperties::_nil();