Merge pull request #55 from gdgd009xcd/JOHANESS250122

## [v0.8.18] - 2025-01-22

Author: gdgd009xcd

README.md

@@ -96,7 +96,7 @@ This addon is 3rd party addon, so you must add this addon file to ZAPROXY manual
 ## how to use
 
 1. Active Scan Input Vectors option panel<br>
-This addon is automatically called when you start active scannig after already installed default scanners.
+When you start active scannig, This addon is automatically called next to the already installed default scanners.
 If this addon look like doing nothing, you should check:<br> [Tools->Options->Active Scan Input Vectors] option panel.<br>
 If nothing is enabled in this options panel, you may push<br>[Reset to factory defaults] button or check on individually.
 ![InputVectors](assets/images/activescaninputvectors.png)

addOns/customactivescan/CHANGELOG.md

@@ -3,6 +3,10 @@ All notable changes to this add-on will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [v0.8.18] - 2025-01-22
+### Changed
+- bugfix: Fixed a weird popup menu that enlarge each time when it is shown in the ScanLog panel.
+
 ## [v0.8.17] - 2025-01-20
 ### Changed
 - bugfix: fixed null exception errors with using CustomScan Main Panel GUI. I apologize for the inconvenience.

addOns/customactivescan/customactivescan.gradle.kts

@@ -1,7 +1,7 @@
 import org.zaproxy.gradle.addon.AddOnStatus
 
 
-version = "0.8.17"
+version = "0.8.18"
 description = "a Active Scanner with custmizable rules"
 
 val jar by tasks.getting(Jar::class) {

addOns/customactivescan/src/main/java/org/zaproxy/zap/extension/customactivescan/view/ScanLogPanelPopUp.java

@@ -1,51 +1,28 @@
 package org.zaproxy.zap.extension.customactivescan.view;
 
-import org.parosproxy.paros.view.MainPopupMenu;
 import org.parosproxy.paros.view.View;
 import org.zaproxy.zap.view.messagecontainer.http.DefaultSingleHttpMessageContainer;
 
 import javax.swing.*;
-import javax.swing.text.Position;
 import java.awt.*;
 
 public class ScanLogPanelPopUp extends JPopupMenu {
 
+    private static final long serialVersionUID = 1L;
     private final static org.apache.logging.log4j.Logger LOGGER4J =
             org.apache.logging.log4j.LogManager.getLogger();
 
-    private MainPopupMenu mainPopupMenu;
-    private ScanLogPanel scanLogPanel;
-    private JViewport scanLogViewPort = null;
+    final private ScanLogPanel scanLogPanel;
+    final private JViewport scanLogViewPort;
+
     ScanLogPanelPopUp(JScrollPane scanLogScroller, ScanLogPanel scanLogPanel) {
         this.scanLogPanel = scanLogPanel;
-        this.mainPopupMenu = View.getSingleton().getPopupMenu();
         this.scanLogViewPort = scanLogScroller.getViewport();
     }
-        private static final long serialVersionUID = 1L;
-
 
-    @Override
-    public JMenuItem add(JMenuItem item) {
-        return this.mainPopupMenu.add(item);
-    }
     @Override
     public void show(Component invoker, int x, int y) {
-        /**
-        if (!httpPanelTextArea.isFocusOwner()) {
-            httpPanelTextArea.requestFocusInWindow();
-        }
 
-        if (httpPanelTextArea.getMessage() instanceof HttpMessage) {
-            SingleHttpMessageContainer messageContainer =
-                    new DefaultSingleHttpMessageContainer(
-                            messageContainerName,
-                            httpPanelTextArea,
-                            (HttpMessage) httpPanelTextArea.getMessage());
-            View.getSingleton().getPopupMenu().show(messageContainer, x, y);
-        } else {
-            View.getSingleton().getPopupMenu().show(httpPanelTextArea, x, y);
-        }
-         **/
         LOGGER4J.debug("scanLogPane is " + (scanLogPanel==null ? "null" : "valid"));
         if (scanLogPanel.getSelectedMessage() != null) {
 
@@ -59,13 +36,14 @@ public void show(Component invoker, int x, int y) {
                             scanLogPanel,
                             scanLogPanel.getSelectedMessage());
             Point viewPoint = this.scanLogViewPort.getViewPosition();
-            // fix popup is showed in outer area of scanLogViewPort
-            this.mainPopupMenu.show(messageContainer, x, y - viewPoint.y);
-
-            LOGGER4J.debug("x=" + x + " y=" + y);
+            // fix popup is showed in outer area of scanLogViewPort y ->  y -viewPoint.y
+            // Don't get the instance of org.parosproxy.paros.view.MainPopupMenu from View.getSingleton().getPopupMenu() directly.
+            // Because it is not a pure singleton instance. if you get the instance from View.getSingleton().getPopupMenu() and reuse it,
+            // you may encouter strange behavior that the popup menu enlarge its size each time when it is shown.
+            View.getSingleton().getPopupMenu().show(messageContainer, x, y - viewPoint.y);
+            LOGGER4J.debug("x=" + x + " y=" + (y - viewPoint.y));
         } else {
             LOGGER4J.debug("getSelectedMessage is NULL");
         }
-
     }
 }