diff --git a/pom.xml b/pom.xml index 3b1ea7fe6..7dce6c198 100644 --- a/pom.xml +++ b/pom.xml @@ -120,12 +120,12 @@ UTF-8 ${project.build.directory}/keystore 1.35.0 - 2.89.0 + 2.90.0 0.4.0 3.20.0 RELEASE170 1.22.1 - 7.17.0 + 7.22.0 2.17.1 2.2.1 @@ -162,13 +162,20 @@ org.eclipse.jgit org.eclipse.jgit - 7.5.0.202512021534-r + 7.6.0.202603022253-r org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.5.0.202512021534-r + 7.6.0.202603022253-r + + + + + org.codehaus.plexus + plexus-utils + 4.0.3 @@ -178,7 +185,7 @@ org.eclipse.platform org.eclipse.text - 3.14.500 + 3.14.600 org.eclipse.platform @@ -195,7 +202,7 @@ org.eclipse.jdt org.eclipse.jdt.core - 3.44.0 + 3.45.0 org.eclipse.platform @@ -298,7 +305,7 @@ com.diffplug.spotless spotless-lib - 4.4.0 + 4.5.0 @@ -318,13 +325,13 @@ com.fasterxml.jackson.core jackson-core - 2.21.1 + 2.21.3 com.fasterxml.jackson.core jackson-databind - 2.21.1 + 2.21.3 @@ -545,7 +552,7 @@ commons-io commons-io - 2.21.0 + 2.22.0 @@ -589,7 +596,7 @@ com.google.guava guava - 33.5.0-jre + 33.6.0-jre @@ -846,12 +853,12 @@ com.github.spotbugs spotbugs-maven-plugin - 4.9.8.2 + 4.9.8.3 org.owasp dependency-check-maven - 12.2.0 + 12.2.1 nvd-api-key false diff --git a/src/changes/changes.xml b/src/changes/changes.xml index bd9e62b68..258590830 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -9,7 +9,13 @@ - + + + Updated to latest dependency and plugin versions + + + Fixed status and notification messages + diff --git a/src/main/java/de/funfried/netbeans/plugins/external/formatter/css/cssparser/CssParserFormatJob.java b/src/main/java/de/funfried/netbeans/plugins/external/formatter/css/cssparser/CssParserFormatJob.java index f328ef2d5..10f4a9608 100644 --- a/src/main/java/de/funfried/netbeans/plugins/external/formatter/css/cssparser/CssParserFormatJob.java +++ b/src/main/java/de/funfried/netbeans/plugins/external/formatter/css/cssparser/CssParserFormatJob.java @@ -65,15 +65,15 @@ public void format() throws BadLocationException { if (setFormattedCode(code, formattedContent)) { SwingUtilities.invokeLater(() -> { if (pref.getBoolean(Settings.SHOW_NOTIFICATIONS, false)) { - NotificationDisplayer.getDefault().notify("Format using CssParser", Icons.ICON_EXTERNAL, "", null); + NotificationDisplayer.getDefault().notify("Format using CssParser", Icons.ICON_EXTERNAL, "", null, NotificationDisplayer.Priority.NORMAL, NotificationDisplayer.Category.INFO); } - StatusDisplayer.getDefault().setStatusText("Format using CssParser"); + StatusDisplayer.getDefault().setStatusText("Format using CssParser", 100); }); } } catch (FormattingFailedException ex) { SwingUtilities.invokeLater(() -> { - StatusDisplayer.getDefault().setStatusText("Failed to format using CssParser: " + ex.getMessage()); + StatusDisplayer.getDefault().setStatusText("Failed to format using CssParser: " + ex.getMessage(), 100); }); throw ex; diff --git a/src/main/java/de/funfried/netbeans/plugins/external/formatter/eclipse/AbstractEclipseFormatJob.java b/src/main/java/de/funfried/netbeans/plugins/external/formatter/eclipse/AbstractEclipseFormatJob.java index 773048e19..c19643718 100644 --- a/src/main/java/de/funfried/netbeans/plugins/external/formatter/eclipse/AbstractEclipseFormatJob.java +++ b/src/main/java/de/funfried/netbeans/plugins/external/formatter/eclipse/AbstractEclipseFormatJob.java @@ -133,10 +133,10 @@ public final void format() throws BadLocationException { SwingUtilities.invokeLater(() -> { if (pref.getBoolean(Settings.SHOW_NOTIFICATIONS, false)) { - NotificationDisplayer.getDefault().notify("Format using Eclipse formatter", Icons.ICON_ECLIPSE, msg, null); + NotificationDisplayer.getDefault().notify("Format using Eclipse formatter", Icons.ICON_ECLIPSE, msg, null, NotificationDisplayer.Priority.NORMAL, NotificationDisplayer.Category.INFO); } - StatusDisplayer.getDefault().setStatusText("Format using Eclipse formatter: " + msg); + StatusDisplayer.getDefault().setStatusText("Format using Eclipse formatter: " + msg, 100); }); } } catch (ProfileNotFoundException ex) { @@ -147,7 +147,7 @@ public final void format() throws BadLocationException { NotifyDescriptor.ERROR_MESSAGE); DialogDisplayer.getDefault().notify(notify); - StatusDisplayer.getDefault().setStatusText(String.format("Profile '%s' not found in %s", formatterProfile, formatterFile)); + StatusDisplayer.getDefault().setStatusText(String.format("Profile '%s' not found in %s", formatterProfile, formatterFile), 100); }); throw ex; @@ -157,13 +157,13 @@ public final void format() throws BadLocationException { NotifyDescriptor.ERROR_MESSAGE); DialogDisplayer.getDefault().notify(notify); - StatusDisplayer.getDefault().setStatusText(String.format("Could not find configuration file %s. Make sure the file exists and it can be read.", formatterFile)); + StatusDisplayer.getDefault().setStatusText(String.format("Could not find configuration file %s. Make sure the file exists and it can be read.", formatterFile), 100); }); throw ex; } catch (FormattingFailedException ex) { SwingUtilities.invokeLater(() -> { - StatusDisplayer.getDefault().setStatusText("Failed to format using Eclipse formatter: " + ex.getMessage()); + StatusDisplayer.getDefault().setStatusText("Failed to format using Eclipse formatter: " + ex.getMessage(), 100); }); throw ex; diff --git a/src/main/java/de/funfried/netbeans/plugins/external/formatter/html/jsoup/JsoupHtmlFormatJob.java b/src/main/java/de/funfried/netbeans/plugins/external/formatter/html/jsoup/JsoupHtmlFormatJob.java index 4aa6089f8..acc0ab3e9 100644 --- a/src/main/java/de/funfried/netbeans/plugins/external/formatter/html/jsoup/JsoupHtmlFormatJob.java +++ b/src/main/java/de/funfried/netbeans/plugins/external/formatter/html/jsoup/JsoupHtmlFormatJob.java @@ -88,10 +88,10 @@ public void format() throws BadLocationException { if (setFormattedCode(code, formattedContent)) { SwingUtilities.invokeLater(() -> { if (pref.getBoolean(Settings.SHOW_NOTIFICATIONS, false)) { - NotificationDisplayer.getDefault().notify("Format using Jsoup HTML formatter", Icons.ICON_JSOUP, "", null); + NotificationDisplayer.getDefault().notify("Format using Jsoup HTML formatter", Icons.ICON_JSOUP, "", null, NotificationDisplayer.Priority.NORMAL, NotificationDisplayer.Category.INFO); } - StatusDisplayer.getDefault().setStatusText("Format using Jsoup HTML formatter"); + StatusDisplayer.getDefault().setStatusText("Format using Jsoup HTML formatter", 100); }); } } diff --git a/src/main/java/de/funfried/netbeans/plugins/external/formatter/java/base/actions/JavaOrganizeImportsAction.java b/src/main/java/de/funfried/netbeans/plugins/external/formatter/java/base/actions/JavaOrganizeImportsAction.java index 96cf3a914..5d73ba877 100644 --- a/src/main/java/de/funfried/netbeans/plugins/external/formatter/java/base/actions/JavaOrganizeImportsAction.java +++ b/src/main/java/de/funfried/netbeans/plugins/external/formatter/java/base/actions/JavaOrganizeImportsAction.java @@ -57,10 +57,11 @@ public void actionPerformed(ActionEvent evt, JTextComponent target) { SwingUtilities.invokeLater(() -> { if (pref.getBoolean(Settings.SHOW_NOTIFICATIONS, false)) { - NotificationDisplayer.getDefault().notify("Organized imports using NetBeans internal logic", Icons.ICON_NETBEANS, "", null); + NotificationDisplayer.getDefault().notify("Organized imports using NetBeans internal logic", Icons.ICON_NETBEANS, "", null, NotificationDisplayer.Priority.NORMAL, + NotificationDisplayer.Category.INFO); } - StatusDisplayer.getDefault().setStatusText("Organized imports using NetBeans internal logic"); + StatusDisplayer.getDefault().setStatusText("Organized imports using NetBeans internal logic", 100); }); } } diff --git a/src/main/java/de/funfried/netbeans/plugins/external/formatter/java/google/GoogleFormatJob.java b/src/main/java/de/funfried/netbeans/plugins/external/formatter/java/google/GoogleFormatJob.java index 004e972e4..5b8167b84 100644 --- a/src/main/java/de/funfried/netbeans/plugins/external/formatter/java/google/GoogleFormatJob.java +++ b/src/main/java/de/funfried/netbeans/plugins/external/formatter/java/google/GoogleFormatJob.java @@ -70,15 +70,15 @@ public void format() throws BadLocationException { if (setFormattedCode(code, formattedContent)) { SwingUtilities.invokeLater(() -> { if (pref.getBoolean(Settings.SHOW_NOTIFICATIONS, false)) { - NotificationDisplayer.getDefault().notify("Format using Google formatter", Icons.ICON_GOOGLE, "", null); + NotificationDisplayer.getDefault().notify("Format using Google formatter", Icons.ICON_GOOGLE, "", null, NotificationDisplayer.Priority.NORMAL, NotificationDisplayer.Category.INFO); } - StatusDisplayer.getDefault().setStatusText("Format using Google formatter"); + StatusDisplayer.getDefault().setStatusText("Format using Google formatter", 100); }); } } catch (FormattingFailedException ex) { SwingUtilities.invokeLater(() -> { - StatusDisplayer.getDefault().setStatusText("Failed to format using Google formatter: " + ex.getMessage()); + StatusDisplayer.getDefault().setStatusText("Failed to format using Google formatter: " + ex.getMessage(), 100); }); throw ex; @@ -99,15 +99,16 @@ public void organizeImports() throws BadLocationException { if (setFormattedCode(code, formattedContent)) { SwingUtilities.invokeLater(() -> { if (pref.getBoolean(Settings.SHOW_NOTIFICATIONS, false)) { - NotificationDisplayer.getDefault().notify("Organizing imports using Google formatter", Icons.ICON_GOOGLE, "", null); + NotificationDisplayer.getDefault().notify("Organizing imports using Google formatter", Icons.ICON_GOOGLE, "", null, NotificationDisplayer.Priority.NORMAL, + NotificationDisplayer.Category.INFO); } - StatusDisplayer.getDefault().setStatusText("Organizing imports using Google formatter"); + StatusDisplayer.getDefault().setStatusText("Organizing imports using Google formatter", 100); }); } } catch (FormattingFailedException ex) { SwingUtilities.invokeLater(() -> { - StatusDisplayer.getDefault().setStatusText("Failed to organize imports using Google formatter: " + ex.getMessage()); + StatusDisplayer.getDefault().setStatusText("Failed to organize imports using Google formatter: " + ex.getMessage(), 100); }); throw ex; diff --git a/src/main/java/de/funfried/netbeans/plugins/external/formatter/java/palantir/PalantirFormatJob.java b/src/main/java/de/funfried/netbeans/plugins/external/formatter/java/palantir/PalantirFormatJob.java index cbe726d15..b903b8324 100644 --- a/src/main/java/de/funfried/netbeans/plugins/external/formatter/java/palantir/PalantirFormatJob.java +++ b/src/main/java/de/funfried/netbeans/plugins/external/formatter/java/palantir/PalantirFormatJob.java @@ -64,15 +64,15 @@ public void format() throws BadLocationException { if (setFormattedCode(code, formattedContent)) { SwingUtilities.invokeLater(() -> { if (pref.getBoolean(Settings.SHOW_NOTIFICATIONS, false)) { - NotificationDisplayer.getDefault().notify("Format using Palantir formatter", Icons.ICON_EXTERNAL, "", null); + NotificationDisplayer.getDefault().notify("Format using Palantir formatter", Icons.ICON_EXTERNAL, "", null, NotificationDisplayer.Priority.NORMAL, NotificationDisplayer.Category.INFO); } - StatusDisplayer.getDefault().setStatusText("Format using Palantir formatter"); + StatusDisplayer.getDefault().setStatusText("Format using Palantir formatter", 100); }); } } catch (FormattingFailedException ex) { SwingUtilities.invokeLater(() -> { - StatusDisplayer.getDefault().setStatusText("Failed to format using Palantir formatter: " + ex.getMessage()); + StatusDisplayer.getDefault().setStatusText("Failed to format using Palantir formatter: " + ex.getMessage(), 100); }); throw ex; @@ -90,15 +90,16 @@ public void organizeImports() throws BadLocationException { if (setFormattedCode(code, formattedContent)) { SwingUtilities.invokeLater(() -> { if (pref.getBoolean(Settings.SHOW_NOTIFICATIONS, false)) { - NotificationDisplayer.getDefault().notify("Organizing imports using Palantir formatter", Icons.ICON_EXTERNAL, "", null); + NotificationDisplayer.getDefault().notify("Organizing imports using Palantir formatter", Icons.ICON_EXTERNAL, "", null, NotificationDisplayer.Priority.NORMAL, + NotificationDisplayer.Category.INFO); } - StatusDisplayer.getDefault().setStatusText("Organizing imports using Palantir formatter"); + StatusDisplayer.getDefault().setStatusText("Organizing imports using Palantir formatter", 100); }); } } catch (FormattingFailedException ex) { SwingUtilities.invokeLater(() -> { - StatusDisplayer.getDefault().setStatusText("Failed to organize imports using Palantir formatter: " + ex.getMessage()); + StatusDisplayer.getDefault().setStatusText("Failed to organize imports using Palantir formatter: " + ex.getMessage(), 100); }); throw ex; diff --git a/src/main/java/de/funfried/netbeans/plugins/external/formatter/java/spring/SpringFormatJob.java b/src/main/java/de/funfried/netbeans/plugins/external/formatter/java/spring/SpringFormatJob.java index ad8fcdfbe..2f186f700 100644 --- a/src/main/java/de/funfried/netbeans/plugins/external/formatter/java/spring/SpringFormatJob.java +++ b/src/main/java/de/funfried/netbeans/plugins/external/formatter/java/spring/SpringFormatJob.java @@ -74,15 +74,15 @@ public void format() throws BadLocationException { if (setFormattedCode(code, formattedContent)) { SwingUtilities.invokeLater(() -> { if (pref.getBoolean(Settings.SHOW_NOTIFICATIONS, false)) { - NotificationDisplayer.getDefault().notify("Format using Spring formatter", Icons.ICON_SPRING, "", null); + NotificationDisplayer.getDefault().notify("Format using Spring formatter", Icons.ICON_SPRING, "", null, NotificationDisplayer.Priority.NORMAL, NotificationDisplayer.Category.INFO); } - StatusDisplayer.getDefault().setStatusText("Format using Spring formatter"); + StatusDisplayer.getDefault().setStatusText("Format using Spring formatter", 100); }); } } catch (FormattingFailedException ex) { SwingUtilities.invokeLater(() -> { - StatusDisplayer.getDefault().setStatusText("Failed to format using Spring formatter: " + ex.getMessage()); + StatusDisplayer.getDefault().setStatusText("Failed to format using Spring formatter: " + ex.getMessage(), 100); }); throw ex; diff --git a/src/main/java/de/funfried/netbeans/plugins/external/formatter/json/jackson/JacksonFormatJob.java b/src/main/java/de/funfried/netbeans/plugins/external/formatter/json/jackson/JacksonFormatJob.java index 89713533b..2a79fe6b6 100644 --- a/src/main/java/de/funfried/netbeans/plugins/external/formatter/json/jackson/JacksonFormatJob.java +++ b/src/main/java/de/funfried/netbeans/plugins/external/formatter/json/jackson/JacksonFormatJob.java @@ -79,15 +79,15 @@ public void format() throws BadLocationException { if (setFormattedCode(code, formattedContent)) { SwingUtilities.invokeLater(() -> { if (pref.getBoolean(Settings.SHOW_NOTIFICATIONS, false)) { - NotificationDisplayer.getDefault().notify("Format using Jackson Json formatter", Icons.ICON_JACKSON, "", null); + NotificationDisplayer.getDefault().notify("Format using Jackson Json formatter", Icons.ICON_JACKSON, "", null, NotificationDisplayer.Priority.NORMAL, NotificationDisplayer.Category.INFO); } - StatusDisplayer.getDefault().setStatusText("Format using Jackson Json formatter"); + StatusDisplayer.getDefault().setStatusText("Format using Jackson Json formatter", 100); }); } } catch (FormattingFailedException ex) { SwingUtilities.invokeLater(() -> { - StatusDisplayer.getDefault().setStatusText("Failed to format using Jackson Json formatter: " + ex.getMessage()); + StatusDisplayer.getDefault().setStatusText("Failed to format using Jackson Json formatter: " + ex.getMessage(), 100); }); throw ex; diff --git a/src/main/java/de/funfried/netbeans/plugins/external/formatter/sql/dbeaver/DBeaverFormatterJob.java b/src/main/java/de/funfried/netbeans/plugins/external/formatter/sql/dbeaver/DBeaverFormatterJob.java index 4f277935d..d4e914db8 100644 --- a/src/main/java/de/funfried/netbeans/plugins/external/formatter/sql/dbeaver/DBeaverFormatterJob.java +++ b/src/main/java/de/funfried/netbeans/plugins/external/formatter/sql/dbeaver/DBeaverFormatterJob.java @@ -64,14 +64,14 @@ public void format() throws BadLocationException { if (setFormattedCode(code, formattedContent)) { SwingUtilities.invokeLater(() -> { if (pref.getBoolean(Settings.SHOW_NOTIFICATIONS, false)) { - NotificationDisplayer.getDefault().notify("Format using DBeaver SQL formatter", Icons.ICON_DBEAVER, "", null); + NotificationDisplayer.getDefault().notify("Format using DBeaver SQL formatter", Icons.ICON_DBEAVER, "", null, NotificationDisplayer.Priority.NORMAL, NotificationDisplayer.Category.INFO); } - StatusDisplayer.getDefault().setStatusText("Format using DBeaver SQL formatter"); + StatusDisplayer.getDefault().setStatusText("Format using DBeaver SQL formatter", 100); }); } } catch (FormattingFailedException ex) { SwingUtilities.invokeLater(() -> { - StatusDisplayer.getDefault().setStatusText("Failed to format using DBeaver SQL formatter: " + ex.getMessage()); + StatusDisplayer.getDefault().setStatusText("Failed to format using DBeaver SQL formatter: " + ex.getMessage(), 100); }); throw ex; diff --git a/src/main/java/de/funfried/netbeans/plugins/external/formatter/sql/jsqlformatter/JSQLFormatterJob.java b/src/main/java/de/funfried/netbeans/plugins/external/formatter/sql/jsqlformatter/JSQLFormatterJob.java index 84650b008..a227aacd2 100644 --- a/src/main/java/de/funfried/netbeans/plugins/external/formatter/sql/jsqlformatter/JSQLFormatterJob.java +++ b/src/main/java/de/funfried/netbeans/plugins/external/formatter/sql/jsqlformatter/JSQLFormatterJob.java @@ -68,14 +68,14 @@ public void format() throws BadLocationException { if (setFormattedCode(code, formattedContent)) { SwingUtilities.invokeLater(() -> { if (pref.getBoolean(Settings.SHOW_NOTIFICATIONS, false)) { - NotificationDisplayer.getDefault().notify("Format using JSQLFormatter", Icons.ICON_MANTICORE, "", null); + NotificationDisplayer.getDefault().notify("Format using JSQLFormatter", Icons.ICON_MANTICORE, "", null, NotificationDisplayer.Priority.NORMAL, NotificationDisplayer.Category.INFO); } - StatusDisplayer.getDefault().setStatusText("Format using JSQLFormatter"); + StatusDisplayer.getDefault().setStatusText("Format using JSQLFormatter", 100); }); } } catch (FormattingFailedException ex) { SwingUtilities.invokeLater(() -> { - StatusDisplayer.getDefault().setStatusText("Failed to format using JSQLFormatter formatter: " + ex.getMessage()); + StatusDisplayer.getDefault().setStatusText("Failed to format using JSQLFormatter formatter: " + ex.getMessage(), 100); }); throw ex; diff --git a/src/main/java/de/funfried/netbeans/plugins/external/formatter/sql/sqlformatter/SQLFormatterJob.java b/src/main/java/de/funfried/netbeans/plugins/external/formatter/sql/sqlformatter/SQLFormatterJob.java index 4fd6aecf4..4478c4800 100644 --- a/src/main/java/de/funfried/netbeans/plugins/external/formatter/sql/sqlformatter/SQLFormatterJob.java +++ b/src/main/java/de/funfried/netbeans/plugins/external/formatter/sql/sqlformatter/SQLFormatterJob.java @@ -67,14 +67,15 @@ public void format() throws BadLocationException { if (setFormattedCode(code, formattedContent)) { SwingUtilities.invokeLater(() -> { if (pref.getBoolean(Settings.SHOW_NOTIFICATIONS, false)) { - NotificationDisplayer.getDefault().notify("Format using Vertical Blank SQL formatter", Icons.ICON_EXTERNAL, "", null); + NotificationDisplayer.getDefault().notify("Format using Vertical Blank SQL formatter", Icons.ICON_EXTERNAL, "", null, NotificationDisplayer.Priority.NORMAL, + NotificationDisplayer.Category.INFO); } - StatusDisplayer.getDefault().setStatusText("Format using Vertical Blank SQL formatter"); + StatusDisplayer.getDefault().setStatusText("Format using Vertical Blank SQL formatter", 100); }); } } catch (FormattingFailedException ex) { SwingUtilities.invokeLater(() -> { - StatusDisplayer.getDefault().setStatusText("Failed to format using Vertical Blank SQL formatter: " + ex.getMessage()); + StatusDisplayer.getDefault().setStatusText("Failed to format using Vertical Blank SQL formatter: " + ex.getMessage(), 100); }); throw ex; diff --git a/src/main/java/de/funfried/netbeans/plugins/external/formatter/ui/editor/ExternalFormatterIndentTaskFactory.java b/src/main/java/de/funfried/netbeans/plugins/external/formatter/ui/editor/ExternalFormatterIndentTaskFactory.java index 758195346..47cacf1a3 100644 --- a/src/main/java/de/funfried/netbeans/plugins/external/formatter/ui/editor/ExternalFormatterIndentTaskFactory.java +++ b/src/main/java/de/funfried/netbeans/plugins/external/formatter/ui/editor/ExternalFormatterIndentTaskFactory.java @@ -160,10 +160,10 @@ private void formatWithNetBeansIndenter(IndentTask netbeansDefaultTask, Document SwingUtilities.invokeLater(() -> { if (pref.getBoolean(Settings.SHOW_NOTIFICATIONS, false)) { - NotificationDisplayer.getDefault().notify("Format using NetBeans formatter", Icons.ICON_NETBEANS, "", null); + NotificationDisplayer.getDefault().notify("Format using NetBeans formatter", Icons.ICON_NETBEANS, "", null, NotificationDisplayer.Priority.NORMAL, NotificationDisplayer.Category.INFO); } - StatusDisplayer.getDefault().setStatusText("Format using NetBeans formatter"); + StatusDisplayer.getDefault().setStatusText("Format using NetBeans formatter", 100); }); } catch (Throwable ex) { log.log(Level.FINE, "NetBeans internal reindent ran into", ex); diff --git a/src/main/java/de/funfried/netbeans/plugins/external/formatter/ui/editor/ExternalFormatterReformatTaskFactory.java b/src/main/java/de/funfried/netbeans/plugins/external/formatter/ui/editor/ExternalFormatterReformatTaskFactory.java index 276a6cc97..397112125 100644 --- a/src/main/java/de/funfried/netbeans/plugins/external/formatter/ui/editor/ExternalFormatterReformatTaskFactory.java +++ b/src/main/java/de/funfried/netbeans/plugins/external/formatter/ui/editor/ExternalFormatterReformatTaskFactory.java @@ -156,10 +156,10 @@ private void formatWithNetBeansFormatter(ReformatTask netbeansDefaultTask, Docum SwingUtilities.invokeLater(() -> { if (pref.getBoolean(Settings.SHOW_NOTIFICATIONS, false)) { - NotificationDisplayer.getDefault().notify("Format using NetBeans formatter", Icons.ICON_NETBEANS, "", null); + NotificationDisplayer.getDefault().notify("Format using NetBeans formatter", Icons.ICON_NETBEANS, "", null, NotificationDisplayer.Priority.NORMAL, NotificationDisplayer.Category.INFO); } - StatusDisplayer.getDefault().setStatusText("Format using NetBeans formatter"); + StatusDisplayer.getDefault().setStatusText("Format using NetBeans formatter", 100); }); } catch (Throwable ex) { log.log(Level.FINE, "NetBeans internal reformat ran into", ex); diff --git a/src/main/java/de/funfried/netbeans/plugins/external/formatter/xml/jsoup/JsoupXmlFormatJob.java b/src/main/java/de/funfried/netbeans/plugins/external/formatter/xml/jsoup/JsoupXmlFormatJob.java index a1a50b234..0acdf32ea 100644 --- a/src/main/java/de/funfried/netbeans/plugins/external/formatter/xml/jsoup/JsoupXmlFormatJob.java +++ b/src/main/java/de/funfried/netbeans/plugins/external/formatter/xml/jsoup/JsoupXmlFormatJob.java @@ -88,10 +88,10 @@ public void format() throws BadLocationException { if (setFormattedCode(code, formattedContent)) { SwingUtilities.invokeLater(() -> { if (pref.getBoolean(Settings.SHOW_NOTIFICATIONS, false)) { - NotificationDisplayer.getDefault().notify("Format using Jsoup XML formatter", Icons.ICON_JSOUP, "", null); + NotificationDisplayer.getDefault().notify("Format using Jsoup XML formatter", Icons.ICON_JSOUP, "", null, NotificationDisplayer.Priority.NORMAL, NotificationDisplayer.Category.INFO); } - StatusDisplayer.getDefault().setStatusText("Format using Jsoup XML formatter"); + StatusDisplayer.getDefault().setStatusText("Format using Jsoup XML formatter", 100); }); } } diff --git a/src/main/java/de/funfried/netbeans/plugins/external/formatter/xml/revelc/RevelcFormatJob.java b/src/main/java/de/funfried/netbeans/plugins/external/formatter/xml/revelc/RevelcFormatJob.java index 6df453d45..c1e3a5437 100644 --- a/src/main/java/de/funfried/netbeans/plugins/external/formatter/xml/revelc/RevelcFormatJob.java +++ b/src/main/java/de/funfried/netbeans/plugins/external/formatter/xml/revelc/RevelcFormatJob.java @@ -82,10 +82,10 @@ public void format() throws BadLocationException { if (setFormattedCode(code, formattedContent)) { SwingUtilities.invokeLater(() -> { if (pref.getBoolean(Settings.SHOW_NOTIFICATIONS, false)) { - NotificationDisplayer.getDefault().notify("Format using revelc XML formatter", Icons.ICON_REVELC, "", null); + NotificationDisplayer.getDefault().notify("Format using revelc XML formatter", Icons.ICON_REVELC, "", null, NotificationDisplayer.Priority.NORMAL, NotificationDisplayer.Category.INFO); } - StatusDisplayer.getDefault().setStatusText("Format using revelc XML formatter"); + StatusDisplayer.getDefault().setStatusText("Format using revelc XML formatter", 100); }); } }