From 5fcb42210ca3cf3186d7d1438d66c023291411f7 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Thu, 30 Apr 2020 20:20:46 +0200
Subject: [PATCH] #5379 Surface : Add alias

---
 ApplicationCode/ProjectDataModel/RimEclipseView.cpp          | 2 +-
 ApplicationCode/ProjectDataModel/Surfaces/RimFileSurface.cpp | 5 ++++-
 ApplicationCode/ProjectDataModel/Surfaces/RimSurface.cpp     | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp
index 6f8de8f28e..2bdbe5f942 100644
--- a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp
@@ -999,7 +999,7 @@ void RimEclipseView::onLoadDataAndUpdate()
 
     this->m_wellCollection->scaleWellDisks();
 
-    this->m_surfaceCollection->loadData();
+    if ( this->m_surfaceCollection ) this->m_surfaceCollection->loadData();
 
     scheduleReservoirGridGeometryRegen();
     m_simWellsPartManager->clearGeometryCache();
diff --git a/ApplicationCode/ProjectDataModel/Surfaces/RimFileSurface.cpp b/ApplicationCode/ProjectDataModel/Surfaces/RimFileSurface.cpp
index a724bb69cc..2381ea1d23 100644
--- a/ApplicationCode/ProjectDataModel/Surfaces/RimFileSurface.cpp
+++ b/ApplicationCode/ProjectDataModel/Surfaces/RimFileSurface.cpp
@@ -24,7 +24,10 @@
 
 #include <QFileInfo>
 
-CAF_PDM_SOURCE_INIT( RimFileSurface, "FileSurface" );
+// TODO: Use the alias concept prototyped below when the alias concept for class is ready
+// CAF_PDM_SOURCE_INIT( RimFileSurface, "FileSurface", "Surface" );
+// CAF_PDM_SOURCE_INIT( <class>       ,  <keyword>   , <alias>);
+CAF_PDM_SOURCE_INIT( RimFileSurface, "Surface" );
 
 //--------------------------------------------------------------------------------------------------
 ///
diff --git a/ApplicationCode/ProjectDataModel/Surfaces/RimSurface.cpp b/ApplicationCode/ProjectDataModel/Surfaces/RimSurface.cpp
index 52d6b16d3a..d20e9ec7b9 100644
--- a/ApplicationCode/ProjectDataModel/Surfaces/RimSurface.cpp
+++ b/ApplicationCode/ProjectDataModel/Surfaces/RimSurface.cpp
@@ -26,7 +26,7 @@
 
 #include "cafPdmUiDoubleSliderEditor.h"
 
-CAF_PDM_ABSTRACT_SOURCE_INIT( RimSurface, "Surface" );
+CAF_PDM_ABSTRACT_SOURCE_INIT( RimSurface, "SurfaceInterface" );
 
 //--------------------------------------------------------------------------------------------------
 ///