Merge multi-study removal branch.

diff --cc src/PYHELLO/PYHELLO.py
index 36aba6d48638167782129d02e702ed2b40745dfa,64d83cd55c1d064ae84a776b015dbbdcbcf915cf..c5540f94e591c8f639146edbc22c048f2ea9403c
mode 100644,100644..100755
--- 1/src/PYHELLO/PYHELLO.py
--- 2/src/PYHELLO/PYHELLO.py
+++ b/src/PYHELLO/PYHELLO.py
@@@ -77,25 -77,25 +77,27 @@@ class PYHELLO(PYHELLO_ORB__POA.PYHELLO_
      """
      Create object.
      """
-     def createObject( self, study, name ):
+     def createObject( self, name ):
 -        builder = salome.myStudy.NewBuilder()
++        study = getStudy()
 +        builder = study.NewBuilder()
-         father  = findOrCreateComponent( study )
-         object  = builder.NewObject( father )
-         attr    = builder.FindOrCreateAttribute( object, "AttributeName" )
+         father  = findOrCreateComponent()
 -        object  = builder.NewObject( father )
 -        attr    = builder.FindOrCreateAttribute( object, "AttributeName" )
++        obj  = builder.NewObject( father )
++        attr    = builder.FindOrCreateAttribute( obj, "AttributeName" )
          attr.SetValue( name )
--        attr    = builder.FindOrCreateAttribute( object, "AttributeLocalID" )
++        attr    = builder.FindOrCreateAttribute( obj, "AttributeLocalID" )
          attr.SetValue( objectID() )
          pass
  
      """
      Dump module data to the Python script.
      """
-     def DumpPython( self, study, isPublished, isMultiFile ):
+     def DumpPython( self, isPublished, isMultiFile ):
          abuffer = []
          names = []
 -        father = salome.myStudy.FindComponent( moduleName() )
++        study = getStudy()
 +        father = study.FindComponent( moduleName() )
          if father:
 -            iter = salome.myStudy.NewChildIterator( father )
 +            iter = study.NewChildIterator( father )
              while iter.More():
                  name = iter.Value().GetName()
                  if name: names.append( name )

diff --cc src/PYHELLO/PYHELLO_utils.py
index cb54ac1b82e8143bb2c339dc23490f3b64347fbc,224e0fbeb96666f7441b561b183d1ea32da6cadc..d53d1d8ade3ecacd3309ba0ff7ea0ac2fbf98d03
mode 100644,100644..100755
--- 1/src/PYHELLO/PYHELLO_utils.py
--- 2/src/PYHELLO/PYHELLO_utils.py
+++ b/src/PYHELLO/PYHELLO_utils.py
@@@ -32,13 -32,12 +32,14 @@@ __all__ = 
      "getORB",
      "getNS",
      "getLCC",
-     "getStudyManager",
      "getEngine",
++    "getStudy",
      "getEngineIOR",
      "findOrCreateComponent",
      "getObjectID",
      ]
  
++
  from omniORB import CORBA
  from SALOME_NamingServicePy import SALOME_NamingServicePy_i
  from LifeCycleCORBA import LifeCycleCORBA
@@@ -128,18 -127,6 +129,18 @@@ def getLCC()
          pass
      return __lcc__
  
- # Get study manager
- ###
- __study_manager__ = None
- def getStudyManager():
-     global __study_manager__
-     if __study_manager__ is None:
-         obj = getNS().Resolve( '/myStudyManager' )
-         __study_manager__ = obj._narrow( SALOMEDS.StudyManager )
 +##
-     return __study_manager__
++# Get study
++###
++__study__ = None
++def getStudy():
++    global __study__
++    if __study__ is None:
++      obj = getNS().Resolve( '/Study' )
++        __study__ = obj._narrow( SALOMEDS.Study )
 +        pass
++    return __study__
 +
  ###
  # Get PYHELLO engine
  ###
@@@ -164,10 -151,10 +165,11 @@@ def getEngineIOR()
  ###
  # Find or create PYHELLO component object in a study
  ###
- def findOrCreateComponent( study ):
-     father = study.FindComponent( moduleName() )
+ def findOrCreateComponent():
 -    father = salome.myStudy.FindComponent( moduleName() )
++    study = getStudy()
++    father =study.FindComponent( moduleName() )
      if father is None:
 -        builder = salome.myStudy.NewBuilder()
 +        builder = study.NewBuilder()
          father = builder.NewComponent( moduleName() )
          attr = builder.FindOrCreateAttribute( father, "AttributeName" )
          attr.SetValue( moduleName() )
@@@ -186,10 -173,10 +188,11 @@@
  ###
  # Get object's ID
  ###
- def getObjectID( study, entry ):
+ def getObjectID( entry ):
      ID = unknownID()
-     if study and entry:
++    study = getStudy()
+     if entry:
 -        sobj = salome.myStudy.FindObjectID( entry )
 +        sobj = study.FindObjectID( entry )
          if sobj is not None:
              test, anAttr = sobj.FindAttribute( "AttributeLocalID" )
              if test: ID = anAttr._narrow( SALOMEDS.AttributeLocalID ).Value()

diff --cc src/PYHELLOGUI/PYHELLOGUI.py
index 887d43d4ebdd37a26a99801e424105a1e1d7a3a3,708aa7493a8e81eb4a6b81d85b1b226dc639000d..d352ddf85b90e0506f8f264e0bc04d51637608ea
--- 1/src/PYHELLOGUI/PYHELLOGUI.py
--- 2/src/PYHELLOGUI/PYHELLOGUI.py
+++ b/src/PYHELLOGUI/PYHELLOGUI.py
@@@ -31,6 -31,6 +31,8 @@@ from qtsalome import 
  
  from PYHELLO_utils import *
  
++import salome
++
  ################################################
  # GUI context class
  # Used to store actions, menus, toolbars, etc...