From 198da4d553a5221368588640e29b5d03b6cc4a2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A5l=20Hagen?= <pal@applicano.com>
Date: Tue, 11 Aug 2015 10:55:53 +0200
Subject: [PATCH] Using variable for first selected UI item

---
 .../ProjectDataModel/RimProject.cpp           | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/ApplicationCode/ProjectDataModel/RimProject.cpp b/ApplicationCode/ProjectDataModel/RimProject.cpp
index 33dce492f9..90259d695d 100644
--- a/ApplicationCode/ProjectDataModel/RimProject.cpp
+++ b/ApplicationCode/ProjectDataModel/RimProject.cpp
@@ -536,7 +536,10 @@ void RimProject::actionsBasedOnSelection(std::vector<QAction*>& actions)
 
     if (uiItems.size() == 1)
     {
-        if (dynamic_cast<RimEclipseCase*>(uiItems[0]))
+        caf::PdmUiItem* uiItem = uiItems[0];
+        CVF_ASSERT(uiItem);
+
+        if (dynamic_cast<RimEclipseCase*>(uiItem))
         {
             actions.push_back(commandManager->action("RicEclipseCaseCopy"));
             actions.push_back(commandManager->action("RicEclipseCasePaste"));
@@ -545,7 +548,7 @@ void RimProject::actionsBasedOnSelection(std::vector<QAction*>& actions)
             actions.push_back(commandManager->action("RicEclipseCaseNewGroup"));
             actions.push_back(commandManager->action("RicEclipseCaseExecuteScript"));
         }
-        else if (dynamic_cast<RimEclipseView*>(uiItems[0]))
+        else if (dynamic_cast<RimEclipseView*>(uiItem))
         {
             actions.push_back(commandManager->action("RicEclipseViewNew"));
             actions.push_back(commandManager->action("RicEclipseViewCopy"));
@@ -553,23 +556,23 @@ void RimProject::actionsBasedOnSelection(std::vector<QAction*>& actions)
             actions.push_back(commandManager->action("RicEclipseViewDelete"));
         }
         // MODTODO: Find out why this cast doesn't work
-        else if (dynamic_cast<RimEclipseCellColors*>(uiItems[0]))
+        else if (dynamic_cast<RimEclipseCellColors*>(uiItem))
         {
             actions.push_back(commandManager->action("RicEclipseCellResultSave"));
         }
         // MODTODO: Make sure that "Custom Fault Result" appears in the treeview
-        else if (dynamic_cast<RimEclipseFaultColors*>(uiItems[0]))
+        else if (dynamic_cast<RimEclipseFaultColors*>(uiItem))
         {
             actions.push_back(commandManager->action("RicEclipseFaultResultSave"));
         }
-        else if (dynamic_cast<RimCellRangeFilterCollection*>(uiItems[0]))
+        else if (dynamic_cast<RimCellRangeFilterCollection*>(uiItem))
         {
             actions.push_back(commandManager->action("RicRangeFilterNew"));
             actions.push_back(commandManager->action("RicRangeFilterNewSliceI"));
             actions.push_back(commandManager->action("RicRangeFilterNewSliceJ"));
             actions.push_back(commandManager->action("RicRangeFilterNewSliceK"));
         }
-        else if (dynamic_cast<RimCellRangeFilter*>(uiItems[0]))
+        else if (dynamic_cast<RimCellRangeFilter*>(uiItem))
         {
             actions.push_back(commandManager->action("RicRangeFilterInsert"));
             actions.push_back(commandManager->action("RicRangeFilterNewSliceI"));
@@ -577,11 +580,11 @@ void RimProject::actionsBasedOnSelection(std::vector<QAction*>& actions)
             actions.push_back(commandManager->action("RicRangeFilterNewSliceK"));
             actions.push_back(commandManager->action("RicRangeFilterDelete"));
         }
-        else if (dynamic_cast<RimEclipsePropertyFilterCollection*>(uiItems[0]))
+        else if (dynamic_cast<RimEclipsePropertyFilterCollection*>(uiItem))
         {
             actions.push_back(commandManager->action("RicEclipsePropertyFilterNew"));
         }
-        else if (dynamic_cast<RimEclipsePropertyFilter*>(uiItems[0]))
+        else if (dynamic_cast<RimEclipsePropertyFilter*>(uiItem))
         {
             actions.push_back(commandManager->action("RicEclipsePropertyFilterInsert"));
             actions.push_back(commandManager->action("RicEclipsePropertyFilterDelete"));