Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump ZAP version and use ZapHtmlLabel #27

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion zaproxy/pom.xml
Expand Up @@ -316,7 +316,7 @@
<dependency>
<groupId>org.zaproxy</groupId>
<artifactId>zap</artifactId>
<version>2.7.0</version>
<version>2.12.0</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
Expand Up @@ -70,6 +70,7 @@
import org.parosproxy.paros.extension.AbstractPanel;
import org.parosproxy.paros.extension.ViewDelegate;
import org.parosproxy.paros.model.Model;
import org.zaproxy.zap.utils.ZapHtmlLabel;

import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
Expand Down Expand Up @@ -786,7 +787,7 @@ public void mouseClicked(MouseEvent e)

JPanel detailPanel = new JPanel();
detailPanel.setLayout(new GridBagLayout());
JLabel displayArea = new JLabel();
JLabel displayArea = new ZapHtmlLabel();
String displayStr = new String();
int y = 0;
GridBagConstraints gridBagConstraints1 = new GridBagConstraints();
Expand Down Expand Up @@ -984,7 +985,7 @@ private JLabel addPanelTitleToGridBagLayout(String titleText, Container gridBagC

private JLabel addPanelDescriptionToGridBagLayout(String descriptionText, Container gridBagContainer, int yPosition)
{
final JLabel panelDescription = new JLabel(descriptionText);
final JLabel panelDescription = new ZapHtmlLabel(descriptionText);
panelDescription.setHorizontalAlignment(SwingConstants.LEFT);
GridBagConstraints gridBagConstraints = new GridBagConstraints();
gridBagConstraints.gridwidth = 3;
Expand Down
Expand Up @@ -8,7 +8,7 @@
<changes>
<![CDATA[
Various incremental changes (see https://github.com/secdec/attack-surface-detector-zap/releases)<br>
Fix un-handled exception when target unavailable & address various "house keeping" tasks.<br>
Properly display HTML content in GUI.<br>
]]>
</changes>
<extensions>
Expand Down