MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-04 17:20:55 +07:00
Code Issues Packages Projects Releases Wiki Activity

DBE-15813, DBE-19168: added 'Full Message' button to show a full error message

Browse Source 
GitOrigin-RevId: 1abfa859bdd0822a5f7a9130bcc1c659919ddb36
This commit is contained in:
Ekaterina Chernikova
2025-02-28 15:58:19 +01:00
committed by intellij-monorepo-bot
parent c866028fcd
commit 39e9216447
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
grid/core-impl/resources/messages/DataGridBundle.properties
View File

@@ -16,6 +16,7 @@ grid.delete.selected.row.action.confirmation=One row selected.\nAre you sure you
grid.delete.selected.rows.action.confirmation=%s rows selected.\nAre you sure you want to delete the selected rows? grid.delete.selected.rows.action.confirmation=%s rows selected.\nAre you sure you want to delete the selected rows?
grid.delete.selected.row.action.text=Delete Row %s grid.delete.selected.row.action.text=Delete Row %s
action.details.text=Details action.details.text=Details
action.full.message.text=Full Message
action.close.text=Close action.close.text=Close
tooltip.close.esc=Close (Esc) tooltip.close.esc=Close (Esc)
dialog.title.query.error=Query Error dialog.title.query.error=Query Error

18
grid/impl/src/run/ui/ErrorNotificationPanel.java
View File

@@ -135,6 +135,8 @@ public final class ErrorNotificationPanel extends JPanel {
private final List<Consumer<Disposable>> myShowHideHandlers = new ArrayList<>(); private final List<Consumer<Disposable>> myShowHideHandlers = new ArrayList<>();
private final StringBuilder myHtmlBuilder = new StringBuilder(); private final StringBuilder myHtmlBuilder = new StringBuilder();
private boolean isChoppedMessage = false;
private MessageType myType = MessageType.ERROR; private MessageType myType = MessageType.ERROR;
private Builder(@NlsContexts.NotificationContent @Nullable String message, @Nullable Throwable error, @NotNull JComponent baseComponent) { private Builder(@NlsContexts.NotificationContent @Nullable String message, @Nullable Throwable error, @NotNull JComponent baseComponent) {
@@ -204,6 +206,14 @@ public final class ErrorNotificationPanel extends JPanel {
new String[]{CommonBundle.getOkButtonText()}, 0, Messages.getErrorIcon(), null)); new String[]{CommonBundle.getOkButtonText()}, 0, Messages.getErrorIcon(), null));
} }
public @NotNull Builder addFullMessageButtonIfNeeded() {
if (!isChoppedMessage) return this;
return addLink("details", DataGridBundle.message("action.full.message.text"), () -> Messages.showIdeaMessageDialog(null, myMessage,
DataGridBundle.message("dialog.title.query.error"),
new String[]{CommonBundle.getOkButtonText()}, 0, Messages.getErrorIcon(), null));
}
public @NotNull Builder addCloseButton(Runnable action) { public @NotNull Builder addCloseButton(Runnable action) {
return addIconLink(DataGridBundle.message("action.close.text"), DataGridBundle.message("tooltip.close.esc"), AllIcons.Actions.Close, action); return addIconLink(DataGridBundle.message("action.close.text"), DataGridBundle.message("tooltip.close.esc"), AllIcons.Actions.Close, action);
} }
@@ -225,21 +235,23 @@ public final class ErrorNotificationPanel extends JPanel {
myHtmlBuilder.append("</div></td>"); myHtmlBuilder.append("</div></td>");
} }
private static @NlsContexts.NotificationContent @NotNull String getNormalizedMessage(@NotNull Throwable error) { private @NlsContexts.NotificationContent @NotNull String getNormalizedMessage(@NotNull Throwable error) {
String sourceMessage = StringUtil.notNullize(error.getMessage(), String sourceMessage = StringUtil.notNullize(error.getMessage(),
DataGridBundle.message("notification.content.unknown.problem.occurred.see.details")); DataGridBundle.message("notification.content.unknown.problem.occurred.see.details")) + "kgmsdkgmksdfgnmksndfgknskdfgnksndgkndfkgnsdkfgnskdngkndsfgksnkgnfksdngksdnfgksndkgnsdkfgnksdnfgkndkfgnskngfksnkgfnksdnfgksdnfgknsdkgnslgnskldfnglksnfgksnfgksnkfgnksdfngksdnfgksdngksndfgknsdkf";
// In some cases source message contains stacktrace inside. Let's chop it // In some cases source message contains stacktrace inside. Let's chop it
int divPos = sourceMessage.indexOf("\n\tat "); int divPos = sourceMessage.indexOf("\n\tat ");
if (divPos != -1) { if (divPos != -1) {
sourceMessage = sourceMessage.substring(0, divPos); sourceMessage = sourceMessage.substring(0, divPos);
isChoppedMessage = true;
} }
return getNormalized(sourceMessage); return getNormalized(sourceMessage);
} }
private static @NlsContexts.NotificationContent @NotNull String getNormalized(@NlsContexts.NotificationContent @NotNull String sourceMessage) { private @NlsContexts.NotificationContent @NotNull String getNormalized(@NlsContexts.NotificationContent @NotNull String sourceMessage) {
int lineLimit = StringUtil.lineColToOffset(sourceMessage, 5, 0); int lineLimit = StringUtil.lineColToOffset(sourceMessage, 5, 0);
int charLimit = 1024; int charLimit = 1024;
int limit = lineLimit == -1 || lineLimit > charLimit ? charLimit : lineLimit; int limit = lineLimit == -1 || lineLimit > charLimit ? charLimit : lineLimit;
if (sourceMessage.length() > limit) isChoppedMessage = true;
return StringUtil.trimLog(sourceMessage, limit + 1); return StringUtil.trimLog(sourceMessage, limit + 1);
} }