ResultFilter JSearchのバグ修正

Author: isayan

gradle.properties

@@ -2,3 +2,4 @@ netbeans.org-netbeans-modules-javascript2-requirejs.enabled=true
 release_version_major=3.0
 release_version_minor=7.1
 netbeans.license=mit
+netbeans.hint.jdkPlatform=JDK_17

release/YaguraExtension-v3.0.jar

@@ -556,7 +556,9 @@ public void keyPressed(KeyEvent ke) {
         this.tableResult.getColumnModel().getColumn(5).setMaxWidth(50);
 
         // length
-        this.tableResult.getColumnModel().getColumn(6).setPreferredWidth(40);
+        this.tableResult.getColumnModel().getColumn(6).setMinWidth(40);
+        this.tableResult.getColumnModel().getColumn(6).setPreferredWidth(60);
+        this.tableResult.getColumnModel().getColumn(6).setMaxWidth(80);
 
         // comment
         this.tableResult.getColumnModel().getColumn(7).setPreferredWidth(80);

src/main/java/yagura/view/JSearchTab.java

@@ -922,7 +922,6 @@ public PropertyRowFilter(FilterProperty filterProp) {
         @Override
         public boolean include(RowFilter.Entry<? extends Object, ? extends Object> entry) {
             boolean allFilter = false;
-
             try {
                 ProxyHttpRequestResponse item = (ProxyHttpRequestResponse) entry.getValue(0);
                 boolean showOnlyScopFilter = true;
@@ -967,15 +966,13 @@ public boolean include(RowFilter.Entry<? extends Object, ? extends Object> entry
                     }
                 }
                 // Highlight Color
-                boolean colorFilter = false;
+                boolean colorFilter = true;
                 if (statusFilter && showOnlyScopFilter) {
                     // cololr
                     if (this.filterProp.getShowOnlyHighlightColors()) {
                         EnumSet<MessageHighlightColor> colors = this.filterProp.getHighlightColors();
                         MessageHighlightColor hc = MessageHighlightColor.valueOf(item.annotations().highlightColor());
-                        if (colors.contains(hc)) {
-                            colorFilter = true;
-                        }
+                        colorFilter = colors.contains(hc);
                     }
                 }
                 // Comment Filter
@@ -1036,8 +1033,13 @@ public boolean include(RowFilter.Entry<? extends Object, ? extends Object> entry
                         response = item.response().contains(Pattern.compile(this.filterProp.getResponse(), this.filterProp.isResponseIgnoreCase() ? Pattern.DOTALL : Pattern.DOTALL | Pattern.CASE_INSENSITIVE));
                     }
                 }
+                // ListenerPort
+                boolean listenerPort = true;
+                if (this.filterProp.getListenerPort() > -1) {
+                    listenerPort = this.filterProp.getListenerPort() == item.listenerPort();
+                }
                 // 条件のAND
-                allFilter = (statusFilter && colorFilter && commentFilter && matchFilter && showOnlyScopFilter && hideItemsWithoutResponses && parameterizedRequests && editedMessage && requestMethod && requestURL && request && response);
+                allFilter = (statusFilter && colorFilter && commentFilter && matchFilter && showOnlyScopFilter && hideItemsWithoutResponses && parameterizedRequests && editedMessage && requestMethod && requestURL && request && response && listenerPort);
             } catch (Exception ex) {
                 logger.log(Level.SEVERE, ex.getMessage(), ex);
             }