From b44e7c8691027644f266499d74c706e0096ff6bf Mon Sep 17 00:00:00 2001
From: Corey <1339555+CoreyD97@users.noreply.github.com>
Date: Tue, 5 Dec 2023 12:41:28 +0000
Subject: [PATCH] Fixes #202

---
 .../nccgroup/loggerplusplus/LoggerContextMenuFactory.java   | 6 +++---
 .../loggerplusplus/filter/logfilter/LogTableFilter.java     | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/nccgroup/loggerplusplus/LoggerContextMenuFactory.java b/src/main/java/com/nccgroup/loggerplusplus/LoggerContextMenuFactory.java
index 9c84b7dd..911ee1f2 100644
--- a/src/main/java/com/nccgroup/loggerplusplus/LoggerContextMenuFactory.java
+++ b/src/main/java/com/nccgroup/loggerplusplus/LoggerContextMenuFactory.java
@@ -92,7 +92,7 @@ public void actionPerformed(ActionEvent actionEvent) {
             JMenuItem andFilter = new JMenuItem(new AbstractAction("AND") {
                 @Override
                 public void actionPerformed(ActionEvent actionEvent) {
-                    LoggerPlusPlus.instance.getLogViewController().getLogFilterController().setFilter(logTable.getCurrentFilter().toString() + " && "
+                    LoggerPlusPlus.instance.getLogViewController().getLogFilterController().setFilter(logTable.getCurrentFilter().getFilterExpression() + " && "
                             + "" + context.getFullLabel() + " CONTAINS \"" + selectedText + "\"");
                 }
             });
@@ -100,7 +100,7 @@ public void actionPerformed(ActionEvent actionEvent) {
             JMenuItem andNotFilter = new JMenuItem(new AbstractAction("AND NOT") {
                 @Override
                 public void actionPerformed(ActionEvent actionEvent) {
-                    LoggerPlusPlus.instance.getLogViewController().getLogFilterController().setFilter(logTable.getCurrentFilter().toString() + " && !("
+                    LoggerPlusPlus.instance.getLogViewController().getLogFilterController().setFilter(logTable.getCurrentFilter().getFilterExpression() + " && !("
                             + "" + context.getFullLabel() + " CONTAINS \"" + selectedText + "\")");
                 }
             });
@@ -108,7 +108,7 @@ public void actionPerformed(ActionEvent actionEvent) {
             JMenuItem orFilter = new JMenuItem(new AbstractAction("OR") {
                 @Override
                 public void actionPerformed(ActionEvent actionEvent) {
-                    LoggerPlusPlus.instance.getLogViewController().getLogFilterController().setFilter(logTable.getCurrentFilter().toString() + " || "
+                    LoggerPlusPlus.instance.getLogViewController().getLogFilterController().setFilter(logTable.getCurrentFilter().getFilterExpression() + " || "
                             + context.getFullLabel() + " CONTAINS \"" + selectedText + "\"");
                 }
             });
diff --git a/src/main/java/com/nccgroup/loggerplusplus/filter/logfilter/LogTableFilter.java b/src/main/java/com/nccgroup/loggerplusplus/filter/logfilter/LogTableFilter.java
index 5aaed64b..25134fab 100644
--- a/src/main/java/com/nccgroup/loggerplusplus/filter/logfilter/LogTableFilter.java
+++ b/src/main/java/com/nccgroup/loggerplusplus/filter/logfilter/LogTableFilter.java
@@ -32,4 +32,9 @@ public boolean include(RowFilter.Entry entry) {
         }
         return false;
     }
+
+    @Override
+    public String toString() {
+        return getFilterExpression().toString();
+    }
 }