X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=Noyau%2FN_CO.py;h=7602530778c5402da0dc1fe4754c050b97c70ea2;hb=9f4ff7ed9afd87c96e11d61e442e39e5511f60d1;hp=3f7a3ac76b486a5ff20a8a5470769bc7eb20524d;hpb=9b4a3f9e1b186a5e94945ba5df2c9689505cb1fc;p=tools%2Feficas.git

diff --git a/Noyau/N_CO.py b/Noyau/N_CO.py
index 3f7a3ac7..76025307 100644
--- a/Noyau/N_CO.py
+++ b/Noyau/N_CO.py
@@ -1,54 +1,53 @@
-#@ MODIF N_CO Noyau  DATE 22/02/2005   AUTEUR DURAND C.DURAND 
-# -*- coding: iso-8859-1 -*-
-#            CONFIGURATION MANAGEMENT OF EDF VERSION
-# ======================================================================
-# COPYRIGHT (C) 1991 - 2002  EDF R&D                  WWW.CODE-ASTER.ORG
-# THIS PROGRAM IS FREE SOFTWARE; YOU CAN REDISTRIBUTE IT AND/OR MODIFY
-# IT UNDER THE TERMS OF THE GNU GENERAL PUBLIC LICENSE AS PUBLISHED BY
-# THE FREE SOFTWARE FOUNDATION; EITHER VERSION 2 OF THE LICENSE, OR   
-# (AT YOUR OPTION) ANY LATER VERSION.                                 
+# coding=utf-8
+# Copyright (C) 2007-2013   EDF R&D
 #
-# THIS PROGRAM 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    
-# GENERAL PUBLIC LICENSE FOR MORE DETAILS.                            
+# 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.
 #
-# YOU SHOULD HAVE RECEIVED A COPY OF THE GNU GENERAL PUBLIC LICENSE   
-# ALONG WITH THIS PROGRAM; IF NOT, WRITE TO EDF R&D CODE_ASTER,       
-#    1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.      
-#                                                                       
-#                                                                       
-# ======================================================================
+# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+
+
+from __future__ import absolute_import
+from .N_ASSD import ASSD
+from .N_Exception import AsException
+from .N_VALIDATOR import ValError
+from . import N_utils
 
+#from asojb import AsBase
 
-from N_ASSD import ASSD
-from N_Exception import AsException
-import N_utils
 
-class CO(ASSD):
-  def __init__(self,nom):
-    ASSD.__init__(self,etape=None,sd=None,reg='oui')
-    #
-    #  On demande le nommage du concept
-    #
-    if self.parent : 
-       try:
-          self.parent.NommerSdprod(self,nom)
-       except AsException,e:
-          appel=N_utils.callee_where(niveau=2)
-          raise AsException("Concept CO, fichier: ",appel[1]," ligne : ",appel[0],'\n',e)
-    else:
-       self.nom=nom
+#class CO(ASSD, AsBase):
+class CO(ASSD) :
 
-  def is_object(valeur):
-    """
-          Indique si valeur est d'un type conforme à la classe (retourne 1)
-          ou non conforme (retourne 0)
-    """
-    if hasattr(valeur,'_etape') :
-       # valeur est un concept CO qui a ete transforme par type_sdprod
-       if valeur.etape == valeur._etape:
-           # le concept est bien produit par l'etape
-           return 1
-    return 0
+    def __init__(self, nom):
+        ASSD.__init__(self, etape=None, sd=None, reg='oui')
+        self._as_co = 1
+        #
+        #  On demande le nommage du concept
+        #
+        if self.parent:
+            try:
+                self.parent.NommerSdprod(self, nom)
+            except AsException as e:
+                appel = N_utils.callee_where(niveau=2)
+                raise AsException(
+                    "Concept CO, fichier: ", appel[1], " ligne : ", appel[0], '\n', e)
+        else:
+            self.nom = nom
 
+    def __convert__(cls, valeur):
+        if valeur.is_typco():
+            return valeur
+        raise ValError("Pas un concept CO")
+    __convert__ = classmethod(__convert__)