From 04a12ce592c5a23477f971c3e028e0d68714c7cd Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Fri, 24 Jun 2016 11:42:15 +0200
Subject: [PATCH] (#743) Removed input property collection

---
 .../RimEclipseInputCaseOpm.cpp                | 32 -------------------
 .../ProjectDataModel/RimEclipseInputCaseOpm.h |  3 --
 2 files changed, 35 deletions(-)

diff --git a/ApplicationCode/ProjectDataModel/RimEclipseInputCaseOpm.cpp b/ApplicationCode/ProjectDataModel/RimEclipseInputCaseOpm.cpp
index d5c6e0e273..2a7553b8cc 100644
--- a/ApplicationCode/ProjectDataModel/RimEclipseInputCaseOpm.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseInputCaseOpm.cpp
@@ -48,10 +48,6 @@ RimEclipseInputCaseOpm::RimEclipseInputCaseOpm()
 
     CAF_PDM_InitField(&m_gridFileName, "GridFileName",  QString(), "Case grid filename", "", "" ,"");
     m_gridFileName.uiCapability()->setUiReadOnly(true);
-
-    CAF_PDM_InitFieldNoDefault(&m_inputPropertyCollection, "InputPropertyCollection", "",  "", "", "");
-    m_inputPropertyCollection = new RimEclipseInputPropertyCollection;
-    m_inputPropertyCollection->parentField()->uiCapability()->setUiHidden(true);
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -59,7 +55,6 @@ RimEclipseInputCaseOpm::RimEclipseInputCaseOpm()
 //--------------------------------------------------------------------------------------------------
 RimEclipseInputCaseOpm::~RimEclipseInputCaseOpm()
 {
-    delete m_inputPropertyCollection;
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -126,33 +121,6 @@ void RimEclipseInputCaseOpm::importEclipseGridAndProperties(const QString& fileN
             return;
         }
 
-        for (auto inputProperty : m_inputPropertyCollection->inputProperties)
-        {
-            inputProperty->resolvedState = RimEclipseInputProperty::KEYWORD_NOT_IN_FILE;
-        }
-
-        for (auto it = mapUiNameToKeyword.begin(); it != mapUiNameToKeyword.end(); ++it)
-        {
-            RimEclipseInputProperty* inputProperty = m_inputPropertyCollection->findInputProperty(it->first);
-
-            if (!inputProperty)
-            {
-                inputProperty = new RimEclipseInputProperty;
-
-                inputProperty->resultName = it->first;
-                inputProperty->eclipseKeyword = it->second;
-                inputProperty->fileName = fileName;
-                inputProperty->resolvedState = RimEclipseInputProperty::RESOLVED;
-
-                m_inputPropertyCollection->inputProperties.push_back(inputProperty);
-            }
-            else
-            {
-                inputProperty->resolvedState = RimEclipseInputProperty::RESOLVED;
-            }
-        }
-
-
         this->reservoirData()->mainGrid()->setFlipAxis(flipXAxis, flipYAxis);
 
         computeCachedData();
diff --git a/ApplicationCode/ProjectDataModel/RimEclipseInputCaseOpm.h b/ApplicationCode/ProjectDataModel/RimEclipseInputCaseOpm.h
index e69f7534f6..2aa2bfef60 100644
--- a/ApplicationCode/ProjectDataModel/RimEclipseInputCaseOpm.h
+++ b/ApplicationCode/ProjectDataModel/RimEclipseInputCaseOpm.h
@@ -43,9 +43,6 @@ public:
     RimEclipseInputCaseOpm();
     virtual ~RimEclipseInputCaseOpm();
 
-    // Fields
-    caf::PdmChildField<RimEclipseInputPropertyCollection*> m_inputPropertyCollection;
-
     void                        importNewEclipseGridAndProperties(const QString& fileName);
 
     // RimCase overrides