Fixes #202

nccgroup · Dec 5, 2023 · b44e7c8 · b44e7c8
1 parent bc8a894
commit b44e7c8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/main/java/com/nccgroup/loggerplusplus/LoggerContextMenuFactory.java b/src/main/java/com/nccgroup/loggerplusplus/LoggerContextMenuFactory.java
@@ -92,23 +92,23 @@ 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 + "\"");
                 }
             });
 
             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 + "\")");
                 }
             });
 
             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
@@ -32,4 +32,9 @@ public boolean include(RowFilter.Entry entry) {
         }
         return false;
     }
+
+    @Override
+    public String toString() {
+        return getFilterExpression().toString();
+    }
 }