Merge branch 'rnv/29456'

[samples/atomsolv.git] / src / ATOMSOLVGUI / ATOMSOLVGUI.cxx

diff --git a/src/ATOMSOLVGUI/ATOMSOLVGUI.cxx b/src/ATOMSOLVGUI/ATOMSOLVGUI.cxx
index 3206e8f48a3c6a9b44e183cad40f9e558f2644dd..6f5fdf42cad2efeec5e8488630251426edefea8f 100644 (file)
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI.cxx
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI.cxx
@@ -22,7 +22,6 @@
 #include "ATOMSOLVGUI_Displayer.h"
 #include "ATOMSOLVGUI_Selection.h"
 #include "ATOMSOLVGUI_TransparencyDlg.h"
-#include "ATOMSOLV_Component_Generator.hxx"
 
 #include <ATOMSOLV_version.h>
 
@@ -77,17 +76,7 @@ void ATOMSOLVGUI::InitATOMSOLVGen( SalomeApp_Application* app )
     myEngine = ATOMSOLV_ORB::ATOMSOLV_Gen::_nil();
   else {
     SALOME_NamingService_Abstract *ns = SalomeApp_Application::namingService();
-    Engines::EngineComponent_var comp;
-    if(ns->IsTrueNS())
-    {
-      comp = app->lcc()->FindOrLoad_Component( "FactoryServer", "ATOMSOLV" );
-    }
-    else
-    {
-      comp = RetrieveATOMSOLVInstance();
-      CORBA::Object_var comp2 = CORBA::Object::_narrow(comp);
-      KERNEL::RegisterCompo("ATOMSOLV",comp2);
-    }
+    Engines::EngineComponent_var comp = app->lcc()->FindOrLoad_Component( "FactoryServer", "ATOMSOLV" );
     ATOMSOLV_ORB::ATOMSOLV_Gen_ptr atomGen = ATOMSOLV_ORB::ATOMSOLV_Gen::_narrow(comp);
     ASSERT( !CORBA::is_nil( atomGen ) );
     myEngine = atomGen;