From 8350cb3b3ddefdd2f884b2ace8a0704bc2bd280d Mon Sep 17 00:00:00 2001
From: Marvin Elsen <git@marvinelsen.com>
Date: Thu, 26 Sep 2024 10:29:30 +0200
Subject: [PATCH] Refactor ClipboardHelper

---
 src/main/kotlin/com/marvinelsen/willow/Model.kt       |  4 ++--
 .../com/marvinelsen/willow/ui/util/ClipboardHelper.kt | 11 ++---------
 .../marvinelsen/willow/ui/util/ContextMenuUtils.kt    |  4 ++--
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/main/kotlin/com/marvinelsen/willow/Model.kt b/src/main/kotlin/com/marvinelsen/willow/Model.kt
index 50d832c..70ba514 100644
--- a/src/main/kotlin/com/marvinelsen/willow/Model.kt
+++ b/src/main/kotlin/com/marvinelsen/willow/Model.kt
@@ -53,10 +53,10 @@ class Model(private val searchService: SearchService, private val findWordsServi
     }
 
     fun copyHeadwordOfSelectedEntry() {
-        ClipboardHelper.copyHeadword(internalSelectedEntry.get())
+        ClipboardHelper.copyString(internalSelectedEntry.value.traditionalProperty.value)
     }
 
     fun copyPronunciationOfSelectedEntry() {
-        ClipboardHelper.copyPronunciation(internalSelectedEntry.get())
+        ClipboardHelper.copyString(internalSelectedEntry.value.pinyinWithToneMarksProperty.value)
     }
 }
diff --git a/src/main/kotlin/com/marvinelsen/willow/ui/util/ClipboardHelper.kt b/src/main/kotlin/com/marvinelsen/willow/ui/util/ClipboardHelper.kt
index 2f56a60..9600f86 100644
--- a/src/main/kotlin/com/marvinelsen/willow/ui/util/ClipboardHelper.kt
+++ b/src/main/kotlin/com/marvinelsen/willow/ui/util/ClipboardHelper.kt
@@ -1,21 +1,14 @@
 package com.marvinelsen.willow.ui.util
 
-import com.marvinelsen.willow.ui.DictionaryEntryFx
 import javafx.scene.input.Clipboard
 import javafx.scene.input.ClipboardContent
 
 object ClipboardHelper {
     private val systemClipboard = Clipboard.getSystemClipboard()
 
-    fun copyHeadword(entry: DictionaryEntryFx) {
+    fun copyString(string: String) {
         val clipboardContent = ClipboardContent()
-        clipboardContent.putString(entry.traditionalProperty.value)
-        systemClipboard.setContent(clipboardContent)
-    }
-
-    fun copyPronunciation(entry: DictionaryEntryFx) {
-        val clipboardContent = ClipboardContent()
-        clipboardContent.putString(entry.pinyinWithToneMarksProperty.value)
+        clipboardContent.putString(string)
         systemClipboard.setContent(clipboardContent)
     }
 }
diff --git a/src/main/kotlin/com/marvinelsen/willow/ui/util/ContextMenuUtils.kt b/src/main/kotlin/com/marvinelsen/willow/ui/util/ContextMenuUtils.kt
index 60a9e41..194b4b7 100644
--- a/src/main/kotlin/com/marvinelsen/willow/ui/util/ContextMenuUtils.kt
+++ b/src/main/kotlin/com/marvinelsen/willow/ui/util/ContextMenuUtils.kt
@@ -9,12 +9,12 @@ import javafx.scene.control.MenuItem
 fun createContextMenuForEntry(entry: DictionaryEntryFx) = ContextMenu().apply {
     val menuItemCopyHeadword =
         MenuItem(WillowApplication.resourceBundle.getString("menubar.edit.copy.headword")).apply {
-            onAction = EventHandler { ClipboardHelper.copyHeadword(entry) }
+            onAction = EventHandler { ClipboardHelper.copyString(entry.traditionalProperty.value) }
         }
 
     val menuItemCopyPronunciation =
         MenuItem(WillowApplication.resourceBundle.getString("menubar.edit.copy.pronunciation")).apply {
-            onAction = EventHandler { ClipboardHelper.copyPronunciation(entry) }
+            onAction = EventHandler { ClipboardHelper.copyString(entry.pinyinWithToneMarksProperty.value) }
         }
 
     items.addAll(menuItemCopyHeadword, menuItemCopyPronunciation)