Skip to content

Commit 868ecf4

Browse files
jakekarnes42jakekarnes42
committed
Add word wrapping for error messages displayed in 'Status' Area
1 parent 62c63d1 commit 868ecf4

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

‎src/main/java/com/netspi/awssigner/controller/AWSSignerController.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,8 @@ private void initListeners() {
310310
//Quick check to see if we need to report the cause at one level deeper
311311
Throwable cause = ex.getCause() == null ? ex : ex.getCause();
312312
logError("Cause: " + cause.getMessage());
313-
view.profileStatusTextLabel.setText("Error testing profile: " + cause.getMessage());
313+
view.profileStatusTextLabel.putClientProperty("html.disable", null);
314+
view.profileStatusTextLabel.setText("<html><b>Error testing profile:</b> " + cause.getMessage() + "</html>");
314315
}
315316
}).start();
316317

@@ -373,7 +374,8 @@ private void initListeners() {
373374
logError("Unable to parse session policy into JSON object and pretty print. Current value: " + sessionPolicy);
374375
//Quick check to see if we need to report the cause at one level deeper
375376
Throwable cause = ex.getCause() == null ? ex : ex.getCause();
376-
view.profileStatusTextLabel.setText("Session policy error: " + cause.getMessage());
377+
view.profileStatusTextLabel.putClientProperty("html.disable", null);
378+
view.profileStatusTextLabel.setText("<html><b>Session policy error:</b> " + cause.getMessage() + "</html>");
377379
}
378380
} else {
379381
logDebug("There's no current session policy. Nothing to set.");

‎src/main/java/com/netspi/awssigner/view/BurpTabPanel.form‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -421,11 +421,11 @@
421421
<Group type="103" groupAlignment="0" attributes="0">
422422
<Group type="102" alignment="0" attributes="0">
423423
<EmptySpace min="10" pref="10" max="-2" attributes="0"/>
424-
<Group type="103" groupAlignment="0" attributes="0">
424+
<Group type="103" groupAlignment="0" max="-2" attributes="0">
425425
<Group type="102" attributes="0">
426426
<Component id="profileStatusLabel" min="-2" max="-2" attributes="0"/>
427427
<EmptySpace max="-2" attributes="0"/>
428-
<Component id="profileStatusTextLabel" min="-2" max="-2" attributes="0"/>
428+
<Component id="profileStatusTextLabel" pref="637" max="32767" attributes="0"/>
429429
</Group>
430430
<Group type="102" alignment="0" attributes="0">
431431
<Group type="103" groupAlignment="0" attributes="0">
@@ -468,9 +468,9 @@
468468
<Component id="profileNameLabel" alignment="3" min="-2" pref="30" max="-2" attributes="0"/>
469469
</Group>
470470
<EmptySpace max="-2" attributes="0"/>
471-
<Group type="103" groupAlignment="3" attributes="0">
472-
<Component id="profileStatusLabel" alignment="3" min="-2" max="-2" attributes="0"/>
473-
<Component id="profileStatusTextLabel" alignment="3" min="-2" max="-2" attributes="0"/>
471+
<Group type="103" groupAlignment="0" attributes="0">
472+
<Component id="profileStatusLabel" min="-2" max="-2" attributes="0"/>
473+
<Component id="profileStatusTextLabel" max="-2" attributes="0"/>
474474
</Group>
475475
<EmptySpace type="unrelated" max="-2" attributes="0"/>
476476
<Group type="103" groupAlignment="3" attributes="0">

‎src/main/java/com/netspi/awssigner/view/BurpTabPanel.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -643,11 +643,11 @@ public void mouseClicked(java.awt.event.MouseEvent evt) {
643643
.addGroup(profileConfigurationPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
644644
.addGroup(profileConfigurationPanelLayout.createSequentialGroup()
645645
.addGap(10, 10, 10)
646-
.addGroup(profileConfigurationPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
646+
.addGroup(profileConfigurationPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
647647
.addGroup(profileConfigurationPanelLayout.createSequentialGroup()
648648
.addComponent(profileStatusLabel)
649649
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
650-
.addComponent(profileStatusTextLabel))
650+
.addComponent(profileStatusTextLabel, javax.swing.GroupLayout.DEFAULT_SIZE, 637, Short.MAX_VALUE))
651651
.addGroup(profileConfigurationPanelLayout.createSequentialGroup()
652652
.addGroup(profileConfigurationPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
653653
.addComponent(profileServiceLabel)
@@ -678,7 +678,7 @@ public void mouseClicked(java.awt.event.MouseEvent evt) {
678678
.addComponent(profileConfigurationLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE)
679679
.addComponent(profileNameLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE))
680680
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
681-
.addGroup(profileConfigurationPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
681+
.addGroup(profileConfigurationPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
682682
.addComponent(profileStatusLabel)
683683
.addComponent(profileStatusTextLabel))
684684
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)

0 commit comments

Comments
 (0)