diff --git a/src/main/kotlin/EditorConstants.kt b/src/main/kotlin/EditorConstants.kt index da82135..f6afb44 100644 --- a/src/main/kotlin/EditorConstants.kt +++ b/src/main/kotlin/EditorConstants.kt @@ -2,7 +2,7 @@ import com.github.weisj.darklaf.LafManager import com.github.weisj.darklaf.theme.OneDarkTheme object EditorConstants { - var BUILD_NUMBER = "1.5.2" + var BUILD_NUMBER = "1.5.3" var DARK_MODE = true diff --git a/src/main/kotlin/TableEditor.kt b/src/main/kotlin/TableEditor.kt index 4ab1119..cdd44b6 100644 --- a/src/main/kotlin/TableEditor.kt +++ b/src/main/kotlin/TableEditor.kt @@ -207,23 +207,24 @@ class TableEditor(val editor: Editors) : JFrame("Editing ${editor.name.replace(" private fun filter() { val regex = Regex("(?i)${searchField.text}") - var rf: RowFilter? = null - //If current expression doesn't parse, don't update. - rf = try { - RowFilter.regexFilter(regex.pattern) - } catch (e: PatternSyntaxException) { - return - } if (editor == Editors.OBJECT_CONFIGS) { + var rf: RowFilter? = null + //If current expression doesn't parse, don't update. + rf = try { + RowFilter.regexFilter(regex.pattern) + } catch (e: PatternSyntaxException) { + return + } sorter.rowFilter = rf } else { - rowHeaderSorter.rowFilter = rf - sorter.rowFilter = object : RowFilter() { + val filter = object : RowFilter() { override fun include(p0: Entry?): Boolean { val rowId: Int = p0?.identifier as? Int ?: return false return regex.containsMatchIn(getData()[rowId]["name"].toString()) } } + rowHeaderSorter.rowFilter = filter + sorter.rowFilter = filter } }