Moved static method to the class where it belongs (more than it did).

ApplicationCode/ProjectDataModel/RimWellLogFile.cpp

@@ -24,8 +24,11 @@
 
 #include "RigWellLogFile.h"
 
+#include "RiuMainWindow.h"
+
 #include <QStringList>
 #include <QFileInfo>
+#include <QMessageBox>
 
 
 CAF_PDM_SOURCE_INIT(RimWellLogFile, "WellLogFile");
@@ -64,6 +67,42 @@ RimWellLogFile::~RimWellLogFile()
 {
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+RimWellLogFile* RimWellLogFile::readWellLogFile(const QString& logFilePath)
+{
+    QFileInfo fi(logFilePath);
+
+    RimWellLogFile* wellLogFile = NULL;
+
+    if (fi.suffix().toUpper().compare("LAS") == 0)
+    {
+        QString errorMessage;
+        wellLogFile = new RimWellLogFile();
+        wellLogFile->setFileName(logFilePath);
+        if (!wellLogFile->readFile(&errorMessage))
+        {
+            QString displayMessage = "Could not open the LAS file: \n" + logFilePath;
+
+            if (!errorMessage.isEmpty())
+            {
+                displayMessage += "\n\n";
+                displayMessage += errorMessage;
+            }
+
+            QMessageBox::warning(RiuMainWindow::instance(), 
+                "File open error", 
+                displayMessage);
+
+            delete wellLogFile;
+            wellLogFile = NULL;
+        }
+    }
+
+    return wellLogFile;
+}
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/RimWellLogFile.h

@@ -43,6 +43,9 @@ public:
     RimWellLogFile();
     virtual ~RimWellLogFile();
 
+    static RimWellLogFile* readWellLogFile(const QString& logFilePath);
+
+
     void    setFileName(const QString& fileName);
     QString fileName() const { return m_fileName; }
 

ApplicationCode/ProjectDataModel/RimWellPath.cpp

@@ -175,42 +175,6 @@ void RimWellPath::readWellPathFile()
 
 }
 
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-RimWellLogFile* RimWellPath::readWellLogFile(const QString& logFilePath)
-{
-    QFileInfo fi(logFilePath);
-
-    RimWellLogFile* wellLogFile = NULL;
-
-    if (fi.suffix().toUpper().compare("LAS") == 0)
-    {
-        QString errorMessage;
-        wellLogFile = new RimWellLogFile();
-        wellLogFile->setFileName(logFilePath);
-        if (!wellLogFile->readFile(&errorMessage))
-        {
-            QString displayMessage = "Could not open the LAS file: \n" + logFilePath;
-
-            if (!errorMessage.isEmpty())
-            {
-                displayMessage += "\n\n";
-                displayMessage += errorMessage;
-            }
-
-            QMessageBox::warning(RiuMainWindow::instance(), 
-                "File open error", 
-                displayMessage);
-
-            delete wellLogFile;
-            wellLogFile = NULL;
-        }
-    }
-
-    return wellLogFile;
-}
-
 //--------------------------------------------------------------------------------------------------
 /// Read JSON file containing well path data
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/RimWellPath.h

@@ -74,7 +74,6 @@ public:
     RivWellPathPartMgr*                 partMgr();
 
     void                                readWellPathFile();
-    static RimWellLogFile*              readWellLogFile(const QString& logFilePath);
     void                                updateFilePathsFromProjectPath();
 
 

ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp

@@ -262,7 +262,7 @@ void RimWellPathCollection::addWellLogs(const QStringList& filePaths)
 {
     foreach (QString filePath, filePaths)
     {
-        RimWellLogFile* logFileInfo = RimWellPath::readWellLogFile(filePath);
+        RimWellLogFile* logFileInfo = RimWellLogFile::readWellLogFile(filePath);
         if (logFileInfo)
         {
             RimWellPath* wellPath = wellPathByName(logFileInfo->wellName());