Skip to content

Fix/failed install dialog wrap #369

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.

Sign up for GitHub

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

Merged
shannah merged 3 commits into from
Jan 3, 2026
Merged

Fix/failed install dialog wrap #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
715613b
fix: Fixed unescaped HTML in failed install error dialog
shannah Jan 3, 2026
ddfcce9
fix: Fix dialog error wrapping
shannah Jan 3, 2026
8484646
fix: Another attempt to fix error message wrapping
shannah Jan 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions installer/src/main/java/ca/weblite/jdeploy/installer/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,8 +756,8 @@ private void onProceedWithUninstallation(InstallationFormEvent evt) {
String finalMessage = message;
invokeLater(() -> uiFactory.showModalErrorDialog(
evt.getInstallationForm(),
"Uninstallation failed. " + finalMessage,
"Failed"
finalMessage,
"Uninstallation Failed"
));
}
}).start();
Expand Down Expand Up @@ -786,7 +786,7 @@ private void onProceedWithInstallation(InstallationFormEvent evt) {
}
}
String finalMessage = message;
invokeLater(()-> uiFactory.showModalErrorDialog(evt.getInstallationForm(), "Installation failed. "+finalMessage, "Failed"));
invokeLater(()-> uiFactory.showModalErrorDialog(evt.getInstallationForm(), finalMessage, "Installation Failed"));
}
}).start();
}
Expand Down
14 changes: 11 additions & 3 deletions shared/src/main/java/com/client4j/security/PermissionTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,12 @@ public static boolean requestPermissions(Component parentComponent, Permission..
return true;
} catch (IOException ex2) {
ex2.printStackTrace();
JOptionPane.showMessageDialog(parentComponent, "<html><p>Failed to install permission:</p><p> "+ex2.getMessage()+"</p></html");

String errorMessage = "<html><body style='width: 400px;'>" +
"<h3>Failed to install permission</h3>" +
"<p>" + ex2.getMessage() + "</p>" +
"</body></html>";
JOptionPane.showMessageDialog(parentComponent, errorMessage, "Error", JOptionPane.ERROR_MESSAGE);

return false;
}
} else {
Expand Down Expand Up @@ -140,7 +144,11 @@ public static boolean requestPermission(Component parentComponent, Permission pe
installPermission(perm);
return true;
} catch (IOException ex2) {
JOptionPane.showMessageDialog(parentComponent, "Failed to install permission: "+ex2.getMessage());
String errorMessage = "<html><body style='width: 400px;'>" +
"<h3>Failed to install permission</h3>" +
"<p>" + ex2.getMessage() + "</p>" +
"</body></html>";
JOptionPane.showMessageDialog(parentComponent, errorMessage, "Error", JOptionPane.ERROR_MESSAGE);
return false;
}
} else {
Expand Down