reindent + copyright + merge manuel avec la V9_dev sauf repertoires metier

[tools/eficas.git] / Validation / V_JDC.py

diff --git a/Validation/V_JDC.py b/Validation/V_JDC.py
index fc13c39f346dad7deb36e109b17e1780fd4dd754..23bfa89f4dc718ba5897691a45c2ccc125d2c1ca 100644 (file)
--- a/Validation/V_JDC.py
+++ b/Validation/V_JDC.py
@@ -1,7 +1,7 @@
 # coding=utf-8
 # person_in_charge: mathieu.courtois at edf.fr
 # ======================================================================
-# COPYRIGHT (C) 1991 - 2015  EDF R&D                  WWW.CODE-ASTER.ORG
+# COPYRIGHT (C) 2007-2021  EDF R&D                  
 # 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
@@ -50,13 +50,13 @@ class JDC(V_MCCOMPO.MCCOMPO):
         self.cr.debut = "BEGIN validation report : " + self.nom
         self.cr.fin = "END validation report :" + self.nom
         for e in self.etapes:
-            if e.isactif():
+            if e.isActif():
                 self.cr.add(e.report())
         self.state = 'modified'
-        self.isvalid(cr='oui')
+        self.isValid(cr='oui')
         return self.cr
 
-    def isvalid(self, cr='non'):
+    def isValid(self, cr='non'):
         """
           Methode booleenne qui retourne 0 si le JDC est invalide, 1 sinon
         """
@@ -66,7 +66,7 @@ class JDC(V_MCCOMPO.MCCOMPO):
             return self.valid
         else:
             valid = 1
-            texte, test = self.verif_regles()
+            texte, test = self.verifRegles()
             if test == 0:
                 if cr == 'oui':
                     if texte != "" and (' '.strip(texte) == "") : self.cr.fatal(texte)
@@ -74,16 +74,16 @@ class JDC(V_MCCOMPO.MCCOMPO):
                 valid = 0
             if valid:
                 for e in self.etapes:
-                    if not e.isactif():
+                    if not e.isActif():
                         continue
-                    if not e.isvalid():
+                    if not e.isValid():
                         valid = 0
                         break
             self.state = "unchanged"
             self.valid = valid
             return self.valid
 
-    def verif_regles(self):
+    def verifRegles(self):
         """
         Effectue la verification de validite des regles du jeu de commandes
         """