From 49417f90bc01b7a3b9d169ae92adebb276475ffc Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andr=C3=A9=20Ribes?= <andre.ribes@edf.fr>
Date: Wed, 9 Mar 2011 15:31:01 +0100
Subject: [PATCH] =?utf8?q?D=C3=A9placement=20du=20logger=20dans=20utils?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/daSalome/daGUI/ADAO.py                              | 2 +-
 src/daSalome/daGUI/ADAOGUI.py                           | 2 +-
 src/daSalome/daGUI/daEficasWrapper/adaoEficasWrapper.py | 2 +-
 src/daSalome/daGUI/daGuiImpl/Makefile.am                | 1 -
 src/daSalome/daGUI/daGuiImpl/adaoGuiManager.py          | 2 +-
 src/daSalome/daGUI/daUtils/Makefile.am                  | 1 +
 src/daSalome/daGUI/{daGuiImpl => daUtils}/adaoLogger.py | 0
 7 files changed, 5 insertions(+), 5 deletions(-)
 rename src/daSalome/daGUI/{daGuiImpl => daUtils}/adaoLogger.py (100%)

diff --git a/src/daSalome/daGUI/ADAO.py b/src/daSalome/daGUI/ADAO.py
index 0d1e1e3..1875621 100644
--- a/src/daSalome/daGUI/ADAO.py
+++ b/src/daSalome/daGUI/ADAO.py
@@ -21,7 +21,7 @@ import ADAO_COMPONENT__POA
 import SALOME_ComponentPy
 import SALOME_DriverPy
 
-from daGuiImpl.adaoLogger import *
+from daUtils.adaoLogger import *
 
 class ADAO(ADAO_COMPONENT__POA.ADAO_ENGINE,
            SALOME_ComponentPy.SALOME_ComponentPy_i,
diff --git a/src/daSalome/daGUI/ADAOGUI.py b/src/daSalome/daGUI/ADAOGUI.py
index 43b361e..caffc37 100644
--- a/src/daSalome/daGUI/ADAOGUI.py
+++ b/src/daSalome/daGUI/ADAOGUI.py
@@ -30,7 +30,7 @@ reasons:
 """
 
 from daGuiImpl import ADAOGUI_impl as GuiImpl
-from daGuiImpl import adaoLogger
+from daUtils import adaoLogger
 
 adaoLogger.debug("Import ADAOGUI")
 
diff --git a/src/daSalome/daGUI/daEficasWrapper/adaoEficasWrapper.py b/src/daSalome/daGUI/daEficasWrapper/adaoEficasWrapper.py
index 8538879..d48d2b6 100644
--- a/src/daSalome/daGUI/daEficasWrapper/adaoEficasWrapper.py
+++ b/src/daSalome/daGUI/daEficasWrapper/adaoEficasWrapper.py
@@ -28,7 +28,7 @@ from PyQt4.QtCore import *        # Import from PyQT
 from PyQt4.QtAssistant import *   # Import from PyQT
 
 from daUtils.adaoEficasEvent import *
-from daGuiImpl.adaoLogger import *
+from daUtils.adaoLogger import *
 
 #
 # ============================================
diff --git a/src/daSalome/daGUI/daGuiImpl/Makefile.am b/src/daSalome/daGUI/daGuiImpl/Makefile.am
index 4ea27e7..17cfa25 100644
--- a/src/daSalome/daGUI/daGuiImpl/Makefile.am
+++ b/src/daSalome/daGUI/daGuiImpl/Makefile.am
@@ -28,7 +28,6 @@ mypkgpython_PYTHON = \
 		     adaoGuiHelper.py \
 		     adaoModuleHelper.py \
 		     adaoStudyEditor.py \
-		     adaoLogger.py \
 		     adaoCase.py
 
 
diff --git a/src/daSalome/daGUI/daGuiImpl/adaoGuiManager.py b/src/daSalome/daGUI/daGuiImpl/adaoGuiManager.py
index 61730ad..b58b278 100644
--- a/src/daSalome/daGUI/daGuiImpl/adaoGuiManager.py
+++ b/src/daSalome/daGUI/daGuiImpl/adaoGuiManager.py
@@ -39,7 +39,7 @@ from daEficasWrapper.adaoEficasWrapper import AdaoEficasWrapper
 from daUtils.adaoEficasEvent import *
 import adaoGuiHelper
 import adaoStudyEditor
-import adaoLogger
+from daUtils import adaoLogger
 
 __cases__ = {}
 
diff --git a/src/daSalome/daGUI/daUtils/Makefile.am b/src/daSalome/daGUI/daUtils/Makefile.am
index 9315c40..4a03778 100644
--- a/src/daSalome/daGUI/daUtils/Makefile.am
+++ b/src/daSalome/daGUI/daUtils/Makefile.am
@@ -24,5 +24,6 @@ mypkgpythondir =$(salomepythondir)/daUtils
 mypkgpython_PYTHON = \
 		     __init__.py \
 		     adaoEficasEvent.py \
+		     adaoLogger.py \
 		     enumerate.py
 
diff --git a/src/daSalome/daGUI/daGuiImpl/adaoLogger.py b/src/daSalome/daGUI/daUtils/adaoLogger.py
similarity index 100%
rename from src/daSalome/daGUI/daGuiImpl/adaoLogger.py
rename to src/daSalome/daGUI/daUtils/adaoLogger.py
-- 
2.39.2