From f9a40ad7caf9e9f06d108990079d201229968117 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Thu, 5 Sep 2013 07:29:22 +0200
Subject: [PATCH] Removed obsolete code and cleaned up interface p4#: 22316

---
 cafUserInterface/cafPdmUiTreeView.cpp | 75 +++------------------------
 cafUserInterface/cafPdmUiTreeView.h   |  4 +-
 2 files changed, 9 insertions(+), 70 deletions(-)

diff --git a/cafUserInterface/cafPdmUiTreeView.cpp b/cafUserInterface/cafPdmUiTreeView.cpp
index 242a3e7e18..cea64e2a92 100644
--- a/cafUserInterface/cafPdmUiTreeView.cpp
+++ b/cafUserInterface/cafPdmUiTreeView.cpp
@@ -43,7 +43,12 @@ PdmUiTreeView::PdmUiTreeView(QWidget* parent, Qt::WindowFlags f)
 
     setLayout(m_layout);
 
-    m_treeViewEditor = NULL;
+    m_treeViewEditor = new PdmUiTreeViewEditor();
+
+    QWidget * widget = m_treeViewEditor->getOrCreateWidget(this);
+
+    this->m_layout->insertWidget(0, widget);
+    this->m_layout->setStretchFactor(widget, 10);
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -64,81 +69,17 @@ void PdmUiTreeView::setUiConfigurationName(QString uiConfigName)
     { 
         m_uiConfigName = uiConfigName;
 
-        if (m_treeViewEditor)
-        {
-            PdmObject* object = m_treeViewEditor->pdmObject();
-            delete m_treeViewEditor;
-            m_treeViewEditor = NULL;
-            this->showTree(object);
-        }
+        m_treeViewEditor->updateUi(m_uiConfigName);
     }
 }
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void PdmUiTreeView::showTree(caf::PdmObject* object)
+void PdmUiTreeView::setPdmObject(caf::PdmObject* object)
 {
-    // Find specialized object view handle 
-
-    // If the current ObjectView has the same type as the one to view, reuse, with Widget etc.
-
-    bool rebuildWidget = false;
-
-    if (!m_treeViewEditor) rebuildWidget = true;
-        
-    if (m_treeViewEditor && m_treeViewEditor->pdmObject())
-    {
-        if (object)
-        {
-            if (m_treeViewEditor->pdmObject()->uiEditorTypeName(m_uiConfigName) != object->uiEditorTypeName(m_uiConfigName))
-            {
-                rebuildWidget = true;
-            }
-        }
-    }
-
-    if (rebuildWidget)
-    {
-        // Remove Widget from layout
-        if (m_treeViewEditor)
-        {
-            layout()->removeWidget(m_treeViewEditor->widget());
-            delete m_treeViewEditor;
-            m_treeViewEditor = NULL;
-        }
-
-        //m_currentObjectView = PdmObjViewFactory::instance()->create(object->editorType(m_uiConfigName));
-        if (!m_treeViewEditor)
-        {
-            m_treeViewEditor = new PdmUiTreeViewEditor();
-        }
-
-        // Create widget to handle this
-        QWidget * widget = NULL;
-        widget = m_treeViewEditor->getOrCreateWidget(this);
-
-        assert(widget);
-
-        this->m_layout->insertWidget(0, widget);
-
-        this->m_layout->setStretchFactor(widget, 10);
-
-    }
-
     m_treeViewEditor->setPdmObject(object);
-    m_treeViewEditor->updateUi(m_uiConfigName);
 }
 
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-caf::PdmObject* PdmUiTreeView::currentObject()
-{
-    if (!m_treeViewEditor) return NULL;
-    return m_treeViewEditor->pdmObject();
-}
-
-
 } //End of namespace caf
 
diff --git a/cafUserInterface/cafPdmUiTreeView.h b/cafUserInterface/cafPdmUiTreeView.h
index ec8437ce0a..b3c8fe521d 100644
--- a/cafUserInterface/cafPdmUiTreeView.h
+++ b/cafUserInterface/cafPdmUiTreeView.h
@@ -41,9 +41,7 @@ public:
     ~PdmUiTreeView();
 
     void setUiConfigurationName(QString uiConfigName);
-    caf::PdmObject* currentObject();
-public slots:
-    void showTree(caf::PdmObject* object);
+    void setPdmObject(caf::PdmObject* object);
 
 private:
     PdmUiTreeViewEditor*    m_treeViewEditor;