Merge pull request #195 from rladstaetter/188-close-all-log-files-sta…

…rt-screen-is-not-shown

188 close all log files start screen is not shown

app/src/main/scala/app/logorrr/views/logfiletab/LogFileTab.scala

@@ -7,6 +7,7 @@ import app.logorrr.model.LogEntry
 import app.logorrr.util._
 import app.logorrr.views.LogoRRRAccelerators
 import app.logorrr.views.autoscroll.LogTailer
+import app.logorrr.views.logfiletab.actions._
 import app.logorrr.views.search.Fltr
 import javafx.beans.binding.Bindings
 import javafx.collections.{ListChangeListener, ObservableList}
@@ -99,7 +100,7 @@ class LogFileTab(val mutLogFileSettings: MutLogFileSettings
   })
 
 
-  def recalculateChunkListViewAndScrollToActiveElement() :Unit = {
+  def recalculateChunkListViewAndScrollToActiveElement(): Unit = {
     logFileTabContent.recalculateChunkListView()
     logFileTabContent.scrollToActiveElement()
   }
@@ -114,7 +115,7 @@ class LogFileTab(val mutLogFileSettings: MutLogFileSettings
     logFileTabContent.init()
 
     /** don't monitor file anymore if tab is closed, free listeners */
-    setOnCloseRequest((_: Event) => cleanupBeforeClose())
+    setOnCloseRequest((_: Event) => shutdown())
 
     if (mutLogFileSettings.isAutoScrollActive) {
       startTailer()
@@ -166,11 +167,6 @@ class LogFileTab(val mutLogFileSettings: MutLogFileSettings
     menu
   }
 
-  def cleanupBeforeClose(): Unit = {
-    shutdown()
-    LogoRRRGlobals.removeLogFile(pathAsString)
-  }
-
   private def addListeners(): Unit = {
     selectedProperty().addListener(selectedListener)
 
@@ -195,6 +191,7 @@ class LogFileTab(val mutLogFileSettings: MutLogFileSettings
       stopTailer()
     }
     removeListeners()
+    LogoRRRGlobals.removeLogFile(pathAsString)
   }
 
 

app/src/main/scala/app/logorrr/views/logfiletab/LogFileTabContent.scala

@@ -15,6 +15,9 @@ import javafx.scene.layout.BorderPane
 class LogFileTabContent(mutLogFileSettings: MutLogFileSettings
                         , val entries: ObservableList[LogEntry]) extends BorderPane {
 
+  // make sure we have a white background for our tabs - see https://github.com/rladstaetter/LogoRRR/issues/188
+  setStyle("-fx-background-color: white;")
+
   /** list which holds all entries, default to display all (can be changed via buttons) */
   private val filteredList = new FilteredList[LogEntry](entries)
 
@@ -34,7 +37,7 @@ class LogFileTabContent(mutLogFileSettings: MutLogFileSettings
 
   def addTailerListener(): Unit = filteredList.addListener(scrollToEndEventListener)
 
-  def removeTailerListener() = filteredList.removeListener(scrollToEndEventListener)
+  def removeTailerListener(): Unit = filteredList.removeListener(scrollToEndEventListener)
 
   val opsToolBar = new OpsToolBar(mutLogFileSettings.getPathAsString(), addFilter, entries, filteredList, mutLogFileSettings.blockSizeProperty)
 

app/src/main/scala/app/logorrr/views/logfiletab/actions/CloseAllFilesMenuItem.scala

@@ -0,0 +1,20 @@
+package app.logorrr.views.logfiletab.actions
+
+import app.logorrr.views.logfiletab.LogFileTab
+import javafx.scene.control.{MenuItem, Tab}
+
+import scala.jdk.CollectionConverters.CollectionHasAsScala
+
+class CloseAllFilesMenuItem(fileTab: => LogFileTab) extends MenuItem("Close All Files") {
+  private val tabPane = fileTab.getTabPane
+  setOnAction(_ => {
+    val toBeDeleted: Seq[Tab] = {
+      tabPane.getTabs.asScala.flatMap { t =>
+        t.asInstanceOf[LogFileTab].shutdown()
+        Option(t)
+      }.toSeq
+    }
+    tabPane.getTabs.removeAll(toBeDeleted: _*)
+  })
+
+}

app/src/main/scala/app/logorrr/views/logfiletab/actions/CloseLeftFilesMenuItem.scala

@@ -0,0 +1,30 @@
+package app.logorrr.views.logfiletab.actions
+
+import app.logorrr.views.logfiletab.LogFileTab
+import javafx.scene.control.{MenuItem, Tab}
+
+import scala.jdk.CollectionConverters.CollectionHasAsScala
+
+class CloseLeftFilesMenuItem(fileTab: => LogFileTab) extends MenuItem("Close Files to the Left") {
+  private val tabPane = fileTab.getTabPane
+  setOnAction(_ => {
+    var deletethem = true
+    val toBeDeleted: Seq[Tab] = {
+      tabPane.getTabs.asScala.flatMap { t =>
+        if (t.asInstanceOf[LogFileTab].pathAsString == fileTab.pathAsString) {
+          deletethem = false
+          None
+        } else {
+          if (deletethem) {
+            t.asInstanceOf[LogFileTab].shutdown()
+            Option(t)
+          } else {
+            None
+          }
+        }
+      }.toSeq
+    }
+    tabPane.getTabs.removeAll(toBeDeleted: _*)
+  })
+
+}

app/src/main/scala/app/logorrr/views/logfiletab/actions/CloseMenuItem.scala

@@ -0,0 +1,13 @@
+package app.logorrr.views.logfiletab.actions
+
+import app.logorrr.views.logfiletab.LogFileTab
+import javafx.scene.control.MenuItem
+
+class CloseMenuItem(fileTab: => LogFileTab) extends MenuItem("Close") {
+
+  setOnAction(_ => Option(fileTab.getTabPane.getSelectionModel.getSelectedItem).foreach { t =>
+    fileTab.shutdown()
+    fileTab.getTabPane.getTabs.remove(t)
+  })
+
+}

app/src/main/scala/app/logorrr/views/logfiletab/actions/CloseOtherFilesMenuItem.scala

@@ -0,0 +1,24 @@
+package app.logorrr.views.logfiletab.actions
+
+import app.logorrr.views.logfiletab.LogFileTab
+import javafx.scene.control.{MenuItem, Tab}
+
+import scala.jdk.CollectionConverters.CollectionHasAsScala
+
+class CloseOtherFilesMenuItem(fileTab: => LogFileTab) extends MenuItem("Close Other Files") {
+  private val tabPane = fileTab.getTabPane
+  setOnAction(_ => {
+    val toBeDeleted: Seq[Tab] = {
+      tabPane.getTabs.asScala.flatMap { t =>
+        if (t.asInstanceOf[LogFileTab].pathAsString == fileTab.pathAsString) {
+          None
+        } else {
+          t.asInstanceOf[LogFileTab].shutdown()
+          Option(t)
+        }
+      }.toSeq
+    }
+    tabPane.getTabs.removeAll(toBeDeleted: _*)
+  })
+
+}

app/src/main/scala/app/logorrr/views/logfiletab/actions/CloseRightFilesMenuItem.scala

@@ -0,0 +1,31 @@
+package app.logorrr.views.logfiletab.actions
+
+import app.logorrr.views.logfiletab.LogFileTab
+import javafx.scene.control.{MenuItem, Tab}
+
+import scala.jdk.CollectionConverters.CollectionHasAsScala
+
+
+class CloseRightFilesMenuItem(fileTab: => LogFileTab) extends MenuItem("Close Files to the Right") {
+  private val tabPane = fileTab.getTabPane
+  setOnAction(_ => {
+    var deletethem = false
+    val toBeDeleted: Seq[Tab] = {
+      tabPane.getTabs.asScala.flatMap { t =>
+        if (t.asInstanceOf[LogFileTab].pathAsString == fileTab.pathAsString) {
+          deletethem = true
+          None
+        } else {
+          if (deletethem) {
+            t.asInstanceOf[LogFileTab].shutdown()
+            Option(t)
+          } else {
+            None
+          }
+        }
+      }.toSeq
+    }
+    tabPane.getTabs.removeAll(toBeDeleted: _*)
+  })
+
+}

app/src/main/scala/app/logorrr/views/logfiletab/actions/OpenInFinderMenuItem.scala

@@ -0,0 +1,23 @@
+package app.logorrr.views.logfiletab.actions
+
+import app.logorrr.util.OsUtil
+import javafx.scene.control.MenuItem
+
+import java.awt.Desktop
+import java.nio.file.Paths
+
+object OpenInFinderMenuItem {
+  val menuItemText: String = if (OsUtil.isWin) {
+    "Show Log in Explorer"
+  } else if (OsUtil.isMac) {
+    "Show Log in Finder"
+  } else {
+    "Show Log ..."
+  }
+}
+
+class OpenInFinderMenuItem(pathAsString: String) extends MenuItem(OpenInFinderMenuItem.menuItemText) {
+
+  setOnAction(_ => Desktop.getDesktop.open(Paths.get(pathAsString).getParent.toFile))
+
+}