Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
33 changes: 20 additions & 13 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,12 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<keystore.file>${project.build.directory}/keystore</keystore.file>
<google-java-format.version>1.35.0</google-java-format.version>
<palantir-java-format.version>2.89.0</palantir-java-format.version>
<palantir-java-format.version>2.90.0</palantir-java-format.version>
<xml-formatter.version>0.4.0</xml-formatter.version>
<commons-lang.version>3.20.0</commons-lang.version>
<netbeans.version>RELEASE170</netbeans.version>
<jsoup.version>1.22.1</jsoup.version>
<pmd.version>7.17.0</pmd.version>
<pmd.version>7.22.0</pmd.version>
<sshd.version>2.17.1</sshd.version>
<scm.version>2.2.1</scm.version>
<argLine></argLine>
Expand Down Expand Up @@ -162,13 +162,20 @@
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
<version>7.5.0.202512021534-r</version>
<version>7.6.0.202603022253-r</version>
</dependency>

<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.ssh.apache</artifactId>
<version>7.5.0.202512021534-r</version>
<version>7.6.0.202603022253-r</version>
</dependency>

<!-- Plexus -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>4.0.3</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand All @@ -178,7 +185,7 @@
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.text</artifactId>
<version>3.14.500</version>
<version>3.14.600</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.platform</groupId>
Expand All @@ -195,7 +202,7 @@
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.core</artifactId>
<version>3.44.0</version>
<version>3.45.0</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.platform</groupId>
Expand Down Expand Up @@ -298,7 +305,7 @@
<dependency>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-lib</artifactId>
<version>4.4.0</version>
<version>4.5.0</version>
</dependency>

<!-- XML Formatter -->
Expand All @@ -318,13 +325,13 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.21.1</version>
<version>2.21.3</version>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.21.1</version>
<version>2.21.3</version>
</dependency>

<!-- CSS Parser -->
Expand Down Expand Up @@ -545,7 +552,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.21.0</version>
<version>2.22.0</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -589,7 +596,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.5.0-jre</version>
<version>33.6.0-jre</version>
</dependency>

<!-- Test -->
Expand Down Expand Up @@ -846,12 +853,12 @@
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>4.9.8.2</version>
<version>4.9.8.3</version>
</plugin>
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
<version>12.2.0</version>
<version>12.2.1</version>
<configuration>
<nvdApiServerId>nvd-api-key</nvdApiServerId>
<assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
Expand Down
8 changes: 7 additions & 1 deletion src/changes/changes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,13 @@
</properties>

<body>
<release version="1.15.7-SNAPSHOT" date="N/A" description="N/A">
<release version="1.15.7-SNAPSHOT" date="N/A" description="Maintenance release">
<action dev="bahlef" type="change">
Updated to latest dependency and plugin versions
</action>
<action dev="bahlef" type="fix">
Fixed status and notification messages
</action>
</release>

<release version="1.15.6" date="2025-10-28" description="Maintenance release">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading
Loading