#182: introduces new constructor for LogFileTab

rladstaetter · Dec 28, 2023 · 7179417 · 7179417
1 parent d970258
commit 7179417
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/app/src/main/scala/app/logorrr/views/logfiletab/LogFileTab.scala b/app/src/main/scala/app/logorrr/views/logfiletab/LogFileTab.scala
@@ -2,7 +2,7 @@ package app.logorrr.views.logfiletab
 
 import app.logorrr.conf.LogoRRRGlobals
 import app.logorrr.conf.mut.MutLogFileSettings
-import app.logorrr.io.{FileId, Fs}
+import app.logorrr.io.FileId
 import app.logorrr.model.LogEntry
 import app.logorrr.util._
 import app.logorrr.views.LogoRRRAccelerators
@@ -35,6 +35,13 @@ object LogFileTab {
       |-fx-border-color: LIGHTGREY;
       |""".stripMargin
 
+  def apply(mutLogFileSettings: MutLogFileSettings
+            , entries: ObservableList[LogEntry]): LogFileTab = {
+    new LogFileTab(mutLogFileSettings.getFileId
+      , mutLogFileSettings
+      , entries)
+  }
+
 }
 
 
@@ -45,12 +52,13 @@ object LogFileTab {
  *
  * @param entries report instance holding information of log file to be analyzed
  * */
-class LogFileTab(val mutLogFileSettings: MutLogFileSettings
+class LogFileTab(val fileId: FileId
+                 , val mutLogFileSettings: MutLogFileSettings
                  , val entries: ObservableList[LogEntry]) extends Tab
   with TimerCode
   with CanLog {
 
-  val fileId: FileId = mutLogFileSettings.getFileId()
+  assert(fileId == mutLogFileSettings.getFileId)
 
   private lazy val logTailer = LogTailer(fileId, entries)
 

diff --git a/app/src/main/scala/app/logorrr/views/main/LogoRRRMain.scala b/app/src/main/scala/app/logorrr/views/main/LogoRRRMain.scala
@@ -37,7 +37,7 @@ class LogoRRRMain(closeStage: => Unit) extends BorderPane with CanLog {
       settings.map(lfs => Future {
         timeR({
           val entries = lfs.readEntries()
-          val tab = new LogFileTab(LogoRRRGlobals.getLogFileSettings(lfs.fileId), entries)
+          val tab = LogFileTab(LogoRRRGlobals.getLogFileSettings(lfs.fileId), entries)
           mainTabPane.addLogFileTab(tab)
           tab
         }, s"Loaded '${lfs.fileId}'")

diff --git a/app/src/main/scala/app/logorrr/views/main/MainTabPane.scala b/app/src/main/scala/app/logorrr/views/main/MainTabPane.scala
@@ -116,7 +116,7 @@ class MainTabPane extends TabPane with CanLog {
     val logFileSettings = LogFileSettings(fileId)
     LogoRRRGlobals.registerSettings(logFileSettings)
 
-    addLogFileTab(new LogFileTab(LogoRRRGlobals.getLogFileSettings(fileId), logFileSettings.readEntries()))
+    addLogFileTab(LogFileTab(LogoRRRGlobals.getLogFileSettings(fileId), logFileSettings.readEntries()))
     selectLog(fileId)
   }
 

diff --git a/app/src/main/scala/app/logorrr/views/settings/timer/TimerSettingStage.scala b/app/src/main/scala/app/logorrr/views/settings/timer/TimerSettingStage.scala
@@ -1,7 +1,6 @@
 package app.logorrr.views.settings.timer
 
 import app.logorrr.conf.mut.MutLogFileSettings
-import app.logorrr.io.Fs
 import app.logorrr.model.{LogEntry, LogEntryInstantFormat}
 import app.logorrr.util.JfxUtils
 import javafx.collections.ObservableList