Skip to content

Commit

Permalink
Merge pull request #195 from funfried/release/1.14.x
Browse files Browse the repository at this point in the history 
Prepared new release 1.14.4
  • Loading branch information
@funfried
funfried authored Feb 7, 2022
2 parents f13b57f + 995afcd commit 3b34e2c
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 26 deletions.
5 changes: 3 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ This plugin helps you to apply to a common code style in a team of Eclipse,
IntelliJ and NetBeans IDE users. You can use several external code formatters
inside the NetBeans IDE (see below), depending on whatever your co-workers use.
The original formatting engine of Eclipse, the Google Code Formatter, the Spring
Java Formatter or any other are embedded and allow you to format the source code
Java Formatter and others are embedded and allow you to format the source code
the same way as e.g. your co-workers do with their Eclipse IDE.

![Global settings](/src/site/resources/imgs/global.png)
Expand Down Expand Up @@ -107,4 +107,5 @@ The history of this project
Support
---------
Keep this project alive by supporting it: one-time [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=926F5XBCTK2LQ&source=url) or [![Patreon!](/src/site/resources/imgs/logos/become_a_patron_button.png)](https://www.patreon.com/funfried) or just [![Buy me a drink](https://img.buymeacoffee.com/button-api/?text=Buy%20me%20a%20drink&emoji=%F0%9F%A5%83&slug=funfried&button_colour=5F7FFF&font_colour=ffffff&font_family=Cookie&outline_colour=000000&coffee_colour=FFDD00)](https://www.buymeacoffee.com/funfried)
If you can't or don't want to spend money you can also [![say thanks](https://img.shields.io/static/v1?label=say&message=thanks&color=green&style=for-the-badge&logo=handshake)](https://saythanks.io/to/funfried)

If you can't or don't want to spend money you can also [![say thanks](https://img.shields.io/static/v1?label=say&message=thanks&color=green&style=for-the-badge&logo=handshake)](https://saythanks.io/to/funfried)
4 changes: 2 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<groupId>de.funfried.netbeans.plugins</groupId>
<artifactId>externalcodeformatter</artifactId>
<version>1.14.4-SNAPSHOT</version>
<version>1.14.4</version>
<packaging>nbm</packaging>

<developers>
Expand Down Expand Up @@ -508,7 +508,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.8.1</version>
<version>2.9.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down
5 changes: 4 additions & 1 deletion src/changes/changes.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,13 @@
</properties>

<body>
<release version="1.14.4-SNAPSHOT" date="N/A" description="Bug fix release">
<release version="1.14.4" date="2022-02-07" description="Bug fix release">
<action dev="bahlef" type="fix" issue="191">
Erroneous formatting with Eclipse when "Override Tab Size" is active
</action>
<action dev="bahlef" type="fix" issue="190">
Fixed issue in Google formatter when there were blank lines at the end of the Java file
</action>
</release>

<release version="1.14.3" date="2022-01-22" description="Bug fix release">
Expand Down
31 changes: 10 additions & 21 deletions src/main/resources/de/funfried/netbeans/plugins/external/formatter/Bundle.properties
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,16 @@
OpenIDE-Module-Display-Category=Editing
OpenIDE-Module-Long-Description=\
<p>This plugin helps you to apply to a common code style in a team of Eclipse, IntelliJ and NetBeans IDE users. You can use several external code formatters inside the NetBeans IDE, depending on whatever your co-workers use. The original formatting engine of Eclipse, the Google Code Formatter, the Spring Java Formatter or any other are embedded and allow you to format the source code the same way as e.g. your co-workers do with their Eclipse IDE.</p>\n\n\
<p>This plugin helps you to apply to a common code style in a team of Eclipse, IntelliJ and NetBeans IDE users. You can use several external code formatters inside the NetBeans IDE, depending on whatever your co-workers use. The original formatting engine of Eclipse, the Google Code Formatter, the Spring Java Formatter and others are embedded and allow you to format the source code the same way as e.g. your co-workers do with their Eclipse IDE.</p>\n\n\
<h3>Features:</h3>\n\
<ul>\n\
<li>Makes use of the internal NetBeans formatting API, which makes it possible to reuse built-in features like the format on save action or format only selected lines ... (since 1.13)</li>\n\
<li>Global configuration and project specific configuration</li>\n\
<li>Shows the used formatter in a notification (Disabled by default)</li>\n\
<li>Supports profiles for Eclipse formatter (since 1.6)</li>\n\
<li>Code templates for @formatter:on/off for Eclipse formatter (since 1.9)</li>\n\
<li>Supports <a href="https://code.google.com/a/eclipselabs.org/p/workspacemechanic/">Workspace Mechanic</a> configuration file for Eclipse formatter (since 1.10)</li>\n\
<li>Support configuration from .settings/org.eclipse.jdt.core.prefs (absolute and relative paths) for Eclipse formatter (since 1.10)</li>\n\
<li>Support configuration of linefeed for Eclipse formatter (since 1.10)</li>\n\
<li>Support configuration of source level for Eclipse formatter (since 1.10)</li>\n\
<li>Support for macro invocation for Eclipse formatter (since 1.12)</li>\n\
<li>Support for guarded documents (documents that are created by the NetBeans GUI builder, guarded blocks are skipped of course, but everything in between can be formatted), only for Eclipse Java Code Formatter (since 1.13)</li>\n\
<li>Support for Google code formatter (since 1.13)</li>\n\
<li>Support for Spring Java formatter (since 1.14)</li>\n\
<li>Support for Eclipse Javascript formatter (since 1.14)</li>\n\
<li>Support for revelc.net XML formatter (since 1.14)</li>\n\
<li>Support for Jsoup XML formatter (since 1.14)</li>\n\
<li>Support for Jackson Json formatter (since 1.14)</li>\n\
<li>Support for manticore JSQLFormatter (Special thanks to <a href="https://github.com/manticore-projects">Andreas Reichel</a> for the contribution) (since 1.14.1)</li>\n\
<li>Support for remote configurations for Eclipse formatters (since 1.14.1)</li>\n\
<li>Global external formatter configuration for all projects and/or project specific configurations</li>\n\
<li>Can show the used formatter in a NetBeans notification (Disabled by default)</li>\n\
<li>Eclipse formatter (profiles, custom linefeeds, custom source levels, macro invocation, remote and <a href="https://code.google.com/a/eclipselabs.org/p/workspacemechanic/">Workspace Mechanic</a> configurations as well as .settings/org.eclipse.jdt.core.prefs (absolute and relative paths), ...)</li>\n\
<li>Code templates for @formatter:on/off (not supported by all formatters, but e.g. Eclipse formatter, Spring formatter, ...)</li>\n\
<li>Support for guarded documents (documents that are created by the NetBeans GUI builder, guarded blocks are skipped of course, but everything in between can be formatted), not supported by the Google Java Code Formatter</li>\n\
<li>Includes many well-known Java formatters like the Google code formatter, the Spring Java formatter, Eclipse Java formatter and more</li>\n\
<li>Includes also non-Java formatters like XML formatters (revelc.net and Jsoup) as well as the Jackson JSON formatter and even an SQL formatter (manticore JSQLFormatter; special thanks to <a href="https://github.com/manticore-projects">Andreas Reichel</a> for the contribution)</li>\n\
</ul>\n\n\
<p><img src="https://raw.githubusercontent.com/funfried/externalcodeformatter_for_netbeans/release/1.14.x/src/site/resources/imgs/global.png"></p>\n\n\
<p><img src="https://raw.githubusercontent.com/funfried/externalcodeformatter_for_netbeans/release/1.14.x/src/site/resources/imgs/project.png"></p>\n\n\
Expand All @@ -33,12 +22,12 @@ OpenIDE-Module-Long-Description=\
<h3>Note:</h3>\n\
<p>Please note that this plugin only provides support for formatting. Eclipse users may miss the application of save-actions like "adding @Override annotations" or "member sort order". Such AST-based transformations are not provided by this plugin.</p>\n\n\
\n\n\
<p>Licensed under the <a href="http://funfried.github.io/externalcodeformatter_for_netbeans/licenses.html">Eclipse Public License, Version 2.0</a></p>\n\
<p>This plugin uses third-party libraries, which are needed to provide its functionality, please check their licenses <a href="http://funfried.github.io/externalcodeformatter_for_netbeans/dependencies.html">here</a></p>\n\n\
<p>For more information go to <a href="http://funfried.github.io/externalcodeformatter_for_netbeans/">http://funfried.github.io/externalcodeformatter_for_netbeans/</a> or <a href="https://github.com/funfried/externalcodeformatter_for_netbeans">https://github.com/funfried/externalcodeformatter_for_netbeans</a></p>\n\n\
<p>Provide defects, request for enhancements and feedback at <a href="https://github.com/funfried/externalcodeformatter_for_netbeans/issues">https://github.com/funfried/externalcodeformatter_for_netbeans/issues</a></p>\n\n\
<p><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=926F5XBCTK2LQ&source=url"><img src="https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif" alt="Donate via PayPal" border="0"></a></p>\
<p><a href="https://www.patreon.com/funfried"><img src="https://raw.githubusercontent.com/funfried/externalcodeformatter_for_netbeans/release/1.14.x/src/site/resources/imgs/logos/become_a_patron_button.png" alt="Become a patron" border="0"></a></p>\
<p><a href="https://www.buymeacoffee.com/funfried"><img src="https://img.buymeacoffee.com/button-api/?text=Buy%20me%20a%20drink&emoji=%F0%9F%A5%83&slug=funfried&button_colour=5F7FFF&font_colour=ffffff&font_family=Cookie&outline_colour=000000&coffee_colour=FFDD00" alt="Buy me a virtual drink" border="0"></a></p>
<p><a href="https://www.buymeacoffee.com/funfried"><img src="https://img.buymeacoffee.com/button-api/?text=Buy%20me%20a%20drink&emoji=%F0%9F%A5%83&slug=funfried&button_colour=5F7FFF&font_colour=ffffff&font_family=Cookie&outline_colour=000000&coffee_colour=FFDD00" alt="Buy me a virtual drink" border="0"></a></p>\
<p><a href="https://saythanks.io/to/funfried"><img src="https://img.shields.io/static/v1?label=say&message=thanks&color=green&style=for-the-badge&logo=handshake" alt="Say Thanks" border="0"></a></p>
OpenIDE-Module-Name=External Code Formatters
OpenIDE-Module-Short-Description=This plugin allows you to use several external code formatters (e.g. Eclipse Java Code Formatter, Eclipse Javascript Code Formatter, Google Java Code Formatter, Spring Java Code Formatter, ...) inside NetBeans

0 comments on commit 3b34e2c

Please sign in to comment.