Merge 4f5f533 into f46dcbb

.travis.yml

@@ -8,9 +8,17 @@ jdk:
 cache:
   directories:
     - $HOME/.m2
-before_install:
-- echo $signing_secret_key | base64 --decode | gpg --import
-- echo $signing_ownertrust | base64 --decode | gpg --import-ownertrust
-install: echo "Skipping pre-fetch of maven dependencies"
-script: cp .ci.settings.xml $HOME/.m2/settings.xml && mvn --no-transfer-progress -Prelease-commons,sonatype-oss-release clean deploy site site:stage scm-publish:publish-scm
-after_success: mvn -Ptravis coveralls:report && mvn --no-transfer-progress -Prelease-commons,github deploy
+jobs:
+  include:
+    - name: setup
+      script:
+      - echo $signing_secret_key | base64 --decode | gpg --import
+      - echo $signing_ownertrust | base64 --decode | gpg --import-ownertrust
+      - cp .ci.settings.xml $HOME/.m2/settings.xml
+    - name: build
+      script: mvn --no-transfer-progress -Prelease-commons,sonatype-oss-release clean package site
+    - name: deploy
+      if: branch = master
+      script:
+      - mvn --no-transfer-progress -Prelease-commons,sonatype-oss-release deploy site site:stage scm-publish:publish-scm
+      - mvn -Ptravis coveralls:report && mvn --no-transfer-progress -Prelease-commons,github deploy

src/main/resources/de/funfried/netbeans/plugins/external/formatter/Bundle.properties

@@ -18,8 +18,8 @@ OpenIDE-Module-Long-Description=\
 	<li>Support for Spring Java formatter (since 1.14)</li>\n\
 	<li>Support for Eclipse Javascript formatter (since 1.14)</li>\n\
 	</ul>\n\n\
-	<p><img src="https://raw.githubusercontent.com/funfried/externalcodeformatter_for_netbeans/master/src/site/resources/imgs/global.png"></p>\n\n\
-	<p><img src="https://raw.githubusercontent.com/funfried/externalcodeformatter_for_netbeans/master/src/site/resources/imgs/project.png"></p>\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\
 	<h3>Known issues:</h3>\n\
 	<ul>\n\
 	<li>Updating the breakpoints after formatting acts not exactly the same way as for the internal NetBeans formatter, but it's pretty close.</li>\n\

src/site/xdoc/usage.xml

@@ -12,24 +12,26 @@
 		<section name="Usage">
 			<p>
 				Just open the preferences dialog in NetBeans after the installation and go to <i>Options</i> -&gt;
-				<i>Java</i> -&gt; <i>External Formatter</i> and setup the formatter as you like.
+				<i>Editor</i> -&gt; <i>External Formatter</i>, select the programming language you want to change
+				the formatter for and setup the formatter as you like.
 			</p>
 			<img src="imgs/global.png" alt="Global options" />
 			<p>
-				You can also setup the formatter individually per project, just right click on the project and click
-				on <i>Properties</i>, navigate to <i>Project properties</i> -&gt; <i>Formatting</i> -&gt;
-				<i>External Formatting</i>. Make it a tick in <i>Override global settings</i>
+				You can also setup the formatters per programming language individually per project, just right
+				click on the project and click on <i>Properties</i>, navigate to <i>Project properties</i> -&gt;
+				<i>Formatting</i> -&gt; <i>External Formatting</i>. Make it a tick in <i>Override global settings</i>.
 			</p>
 			<img src="imgs/project.png" alt="Project options" />
 			<p>
 				If you want to automatically format on saving your files, go to <i>Options</i> -&gt;
-				<i>Editor</i> -&gt; <i>On Save</i> and either select <i>All Languages</i> or <i>Java</i> and choose
-				either <i>All Lines</i> or <i>Modified Lines Only</i>.
+				<i>Editor</i> -&gt; <i>On Save</i> and either select <i>All Languages</i> or the programming
+				language you want to enable the formatting when saving a file and choose either <i>All Lines</i>
+				or <i>Modified Lines Only</i>.
 			</p>
 			<img src="imgs/onsave.png" alt="On Save" />
 			<p>
-				If you select <i>Java</i> in the <i>Languages</i> dropdown, make sure to untick the
-				<i>Use All Languages Settings</i>.
+				If you select a specfic programming language in the <i>Languages</i> dropdown, make sure to untick
+				the <i>Use All Languages Settings</i> for that programming language.
 			</p>
 		</section>
 	</body>