#150: cleanup in app.logorrr.util - wipes out unused code

rladstaetter · Nov 2, 2023 · 4d68438 · 4d68438
1 parent 697f059
commit 4d68438
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 141 deletions.
diff --git a/app/src/main/scala/app/logorrr/util/CpResource.scala b/app/src/main/scala/app/logorrr/util/CpResource.scala
diff --git a/app/src/main/scala/app/logorrr/util/Encoding.scala b/app/src/main/scala/app/logorrr/util/Encoding.scala
diff --git a/app/src/main/scala/app/logorrr/util/ImageCp.scala b/app/src/main/scala/app/logorrr/util/ImageCp.scala
@@ -5,6 +5,8 @@ import javafx.scene.image.{Image, ImageView}
 import java.util.Properties
 
 
+abstract class CpResource(value: String)
+
 case class PropsCp(classPathResource : String) extends CpResource(classPathResource) {
 
   def asProperties(clazz: Class[_]): Properties = {

diff --git a/app/src/main/scala/app/logorrr/util/JfxEventHandler.scala b/app/src/main/scala/app/logorrr/util/JfxEventHandler.scala
diff --git a/app/src/main/scala/app/logorrr/util/JfxUtils.scala b/app/src/main/scala/app/logorrr/util/JfxUtils.scala
@@ -7,7 +7,6 @@ import javafx.stage.{Stage, WindowEvent}
 
 object JfxUtils extends CanLog {
 
-
   def execOnUiThread(f: => Unit): Unit = {
     if (!Platform.isFxApplicationThread) {
       Platform.runLater(() => f)

diff --git a/app/src/main/scala/app/logorrr/util/LogFileUtil.scala b/app/src/main/scala/app/logorrr/util/LogFileUtil.scala
diff --git a/app/src/main/scala/app/logorrr/util/LogUtil.scala b/app/src/main/scala/app/logorrr/util/LogUtil.scala
diff --git a/app/src/main/scala/app/logorrr/util/LogoRRRFileChooser.scala b/app/src/main/scala/app/logorrr/util/LogoRRRFileChooser.scala
@@ -5,16 +5,4 @@ import javafx.stage.{FileChooser, Window}
 
 import java.nio.file.Path
 
-class LogoRRRFileChooser(title: String) {
 
-  def showAndWait(window: Window): Option[Path] = {
-    val fc = new FileChooser
-    fc.setTitle(title)
-    LogoRRRGlobals.getSomeLastUsedDirectory.foreach(d => fc.setInitialDirectory(d.toFile))
-    val somePath = Option(fc.showOpenDialog(window)).map(_.toPath)
-    LogoRRRGlobals.setSomeLastUsedDirectory(somePath.map(_.getParent))
-    LogoRRRGlobals.persist()
-    somePath
-  }
-
-}
diff --git a/app/src/main/scala/app/logorrr/util/StringUtil.scala b/app/src/main/scala/app/logorrr/util/StringUtil.scala
diff --git a/app/src/main/scala/app/logorrr/util/Throttler.scala b/app/src/main/scala/app/logorrr/util/Throttler.scala
diff --git a/...views/block/BorderPaneChunkListView.scala → ...p/logorrr/views/block/ChunkListView.scala b/...views/block/BorderPaneChunkListView.scala → ...p/logorrr/views/block/ChunkListView.scala
@@ -8,7 +8,6 @@ import javafx.beans.property.{SimpleDoubleProperty, SimpleIntegerProperty}
 import javafx.beans.{InvalidationListener, Observable}
 import javafx.collections.{FXCollections, ObservableList}
 import javafx.scene.control.ListView
-import javafx.scene.layout.BorderPane
 
 import scala.util.{Failure, Success, Try}
 

diff --git a/app/src/main/scala/app/logorrr/views/logfiletab/LogFileTab.scala b/app/src/main/scala/app/logorrr/views/logfiletab/LogFileTab.scala
@@ -148,17 +148,8 @@ class LogFileTab(val pathAsString: String
 
   val repaintChunkListViewListener = JfxUtils.onNew[Number](n => {
     if (n.doubleValue() > 0.1) {
-      logTrace("divider")
       repaint()
     }
-    /*
-    throttler.process(n).onComplete {
-      case Success(_) => LogoRRRGlobals.setDividerPosition(pathAsString, n.doubleValue())
-      case Failure(_: CancellationException) => logTrace(s"Computation for $n was cancelled.")
-      case Failure(e) => logException(s"Error processing $n: $e", e)
-    }
-
-     */
   })
 
   def init(): Unit = {

diff --git a/app/src/main/scala/app/logorrr/views/menubar/FileMenu.scala b/app/src/main/scala/app/logorrr/views/menubar/FileMenu.scala
@@ -1,11 +1,25 @@
 package app.logorrr.views.menubar
 
-import app.logorrr.util.{CanLog, LogoRRRFileChooser, OsUtil}
+ import app.logorrr.conf.LogoRRRGlobals
+import app.logorrr.util.{CanLog, OsUtil}
 import javafx.scene.control.{Menu, MenuItem}
-import javafx.stage.Window
+import javafx.stage.{FileChooser, Window}
 
 import java.nio.file.Path
 
+class LogoRRRFileChooser(title: String) {
+
+  def showAndWait(window: Window): Option[Path] = {
+    val fc = new FileChooser
+    fc.setTitle(title)
+    LogoRRRGlobals.getSomeLastUsedDirectory.foreach(d => fc.setInitialDirectory(d.toFile))
+    val somePath = Option(fc.showOpenDialog(window)).map(_.toPath)
+    LogoRRRGlobals.setSomeLastUsedDirectory(somePath.map(_.getParent))
+    LogoRRRGlobals.persist()
+    somePath
+  }
+
+}
 object FileMenu {
 
   class OpenMenuItem(getWindow: () => Window

diff --git a/core/src/main/scala/app/logorrr/io/Fs.scala b/core/src/main/scala/app/logorrr/io/Fs.scala
@@ -3,13 +3,16 @@ package app.logorrr.io
 import app.logorrr.util.CanLog
 
 import java.nio.charset.Charset
-import java.nio.file.{Files, Path}
+import java.nio.file.{Files, Path, Paths}
 
 /**
  * File related operations
  */
 object Fs extends CanLog {
 
+  /** compute file name from a LogFilePath */
+  def logFileName(pathAsString: String): String = Paths.get(pathAsString).getFileName.toString
+
   def createDirectories(path: Path): Unit = {
     if (Files.exists(path)) {
       logTrace(s"Using directory ${path.toAbsolutePath.toString}")