From 6546ab6524a6afa1e9b9bd6321139ee97fd6947c Mon Sep 17 00:00:00 2001 From: GregF Date: Sat, 14 Mar 2026 12:49:03 +0000 Subject: [PATCH] Disable regex searching when using search --- src/main/kotlin/ItemMenu.kt | 4 +++- src/main/kotlin/ShopList.kt | 4 +++- src/main/kotlin/TableEditor.kt | 4 +++- src/main/kotlin/TableList.kt | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/ItemMenu.kt b/src/main/kotlin/ItemMenu.kt index 94456de..f134cdb 100644 --- a/src/main/kotlin/ItemMenu.kt +++ b/src/main/kotlin/ItemMenu.kt @@ -5,6 +5,7 @@ import java.awt.event.KeyListener import java.awt.event.MouseEvent import java.awt.event.MouseListener import java.util.* +import java.util.regex.Pattern import java.util.regex.PatternSyntaxException import javax.swing.* import javax.swing.table.DefaultTableCellRenderer @@ -23,7 +24,8 @@ object ItemMenu : JFrame("Item Selection Menu") { var rf: RowFilter? = null //If current expression doesn't parse, don't update. rf = try { - RowFilter.regexFilter("(?i)${searchField.text}") + val searchPattern = Pattern.quote(searchField.text) + RowFilter.regexFilter("(?i)${searchPattern}") } catch (e: PatternSyntaxException) { return } diff --git a/src/main/kotlin/ShopList.kt b/src/main/kotlin/ShopList.kt index 1358378..c89faff 100644 --- a/src/main/kotlin/ShopList.kt +++ b/src/main/kotlin/ShopList.kt @@ -2,6 +2,7 @@ import java.awt.BorderLayout import java.awt.Dimension import java.awt.event.* import java.util.* +import java.util.regex.Pattern import java.util.regex.PatternSyntaxException import javax.swing.* import javax.swing.table.DefaultTableCellRenderer @@ -105,7 +106,8 @@ class ShopList : JFrame("RS09 Shop Editor") { var rf: RowFilter? = null //If current expression doesn't parse, don't update. rf = try { - RowFilter.regexFilter("(?i)${searchField.text}") + val searchPattern = Pattern.quote(searchField.text) + RowFilter.regexFilter("(?i)${searchPattern}") } catch (e: PatternSyntaxException) { return } diff --git a/src/main/kotlin/TableEditor.kt b/src/main/kotlin/TableEditor.kt index d3dee08..79c8692 100644 --- a/src/main/kotlin/TableEditor.kt +++ b/src/main/kotlin/TableEditor.kt @@ -7,6 +7,7 @@ import java.awt.event.ActionEvent import java.awt.event.KeyEvent import java.awt.event.KeyListener import java.util.* +import java.util.regex.Pattern import java.util.regex.PatternSyntaxException import javax.swing.* import javax.swing.JComponent.WHEN_FOCUSED @@ -222,7 +223,8 @@ class TableEditor(val editor: Editors) : JFrame("Editing ${editor.name.replace(" } private fun filter() { - val regex = Regex("(?i)${searchField.text}") + val searchPattern = Pattern.quote(searchField.text) + val regex = Regex("(?i)${searchPattern}") if (editor == Editors.OBJECT_CONFIGS) { var rf: RowFilter? = null //If current expression doesn't parse, don't update. diff --git a/src/main/kotlin/TableList.kt b/src/main/kotlin/TableList.kt index eead918..0f966d2 100644 --- a/src/main/kotlin/TableList.kt +++ b/src/main/kotlin/TableList.kt @@ -2,6 +2,7 @@ import java.awt.BorderLayout import java.awt.Dimension import java.awt.event.* import java.util.* +import java.util.regex.Pattern import java.util.regex.PatternSyntaxException import javax.swing.* import javax.swing.table.DefaultTableCellRenderer @@ -100,7 +101,8 @@ class TableList : JFrame("RS09 Drop Table Editor") { var rf: RowFilter? = null //If current expression doesn't parse, don't update. rf = try { - RowFilter.regexFilter("(?i)${searchField.text}") + val searchPattern = Pattern.quote(searchField.text) + RowFilter.regexFilter("(?i)${searchPattern}") } catch (e: PatternSyntaxException) { return }