1.5.2 release

jonathanlermitage · Jun 13, 2015 · d03bb86 · d03bb86
1 parent 4190096
commit d03bb86
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## JaCoCoverage Change Log
 
-### Version 1.5.2.20150xxx.xxxx (2015-0x-xx)
+### Version 1.5.2.20150613.1640 (2015-06-13)
 * GitHub #28 allow custom JaCoCo agent path (JaCoCo agent failed with non-ASCII path)
 * updated JaCoCo library to 0.7.5 (see its [changelog](http://www.eclemma.org/jacoco/trunk/doc/changes.html)).
 * minor code cleanup

diff --git a/tikione-jacocoverage-plugin/manifest.mf b/tikione-jacocoverage-plugin/manifest.mf
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 OpenIDE-Module: fr.tikione.jacocoverage.plugin/1
 OpenIDE-Module-Layer: fr/tikione/jacocoverage/plugin/layer.xml
 OpenIDE-Module-Localizing-Bundle: fr/tikione/jacocoverage/plugin/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.5.1.20150301.1800
+OpenIDE-Module-Specification-Version: 1.5.2.20150613.1640
 OpenIDE-Module-Needs: org.openide.filesystems.FileUtil.toFileObject
diff --git a/tikione-jacocoverage-plugin/src/fr/tikione/jacocoverage/plugin/config/Bundle.properties b/tikione-jacocoverage-plugin/src/fr/tikione/jacocoverage/plugin/config/Bundle.properties
@@ -39,7 +39,7 @@ PrjcfgAntJavasePanel.jButtonSocialFacebook.text=
 PrjcfgAntJavasePanel.jButtonOnlineHelp.text=Online help
 PrjcfgAntJavasePanel.jButtonSocialJojohome.text=
 PrjcfgAntJavasePanel.jPanelPackageFiltering.TabConstraints.tabTitle=Package Filtering
-JaCoCoveragePanel.jLabelWorkfilesTips.text=<html>JaCoCo HTML reports are stored into /.jacocoverage/repor.html/ project's subfolder.<br>JaCoCo workfiles are stored into /.jacocoverage/ project's subfolder.</html>
+JaCoCoveragePanel.jLabelWorkfilesTips.text=<html>JaCoCo HTML reports are stored into /.jacocoverage/repor.html/ project's subfolder.<br>JaCoCo workfiles are stored into /.jacocoverage/ project's subfolder.<br>If you use a custom jacocoagent, use same version as bundled (otherwise coverage will fail).</html>
 PrjcfgAntJavasePanel.jButtonRefresh.text=Refresh
 JaCoCoveragePanel.jButtonAbout.text=About
 AboutDialog.title=About JaCoCoverage
@@ -51,4 +51,4 @@ JaCoCoveragePanel.jCheckBoxUseBundledJaCoCoJar.text=Use bundled jacocoagent.jar
 JaCoCoveragePanel.jTextFieldUseCustomJaCoCoJar.text=/foo/bar/jacocoagent.jar
 JaCoCoveragePanel.jButtonSelectCustomJaCoCoJar.text=...
 JaCoCoveragePanel.jLabelEclemmaWebsite.text=www.eclemma.org/jacoco/
-JaCoCoveragePanel.jLabelUseCustomJaCoCoJar.text=Use custom jacocoagent.jar:
+JaCoCoveragePanel.jLabelUseCustomJaCoCoJar.text=Use custom jacocoagent.jar (0.7.5):
diff --git a/tikione-jacocoverage-plugin/src/fr/tikione/jacocoverage/plugin/config/JaCoCoveragePanel.form b/tikione-jacocoverage-plugin/src/fr/tikione/jacocoverage/plugin/config/JaCoCoveragePanel.form
@@ -109,7 +109,7 @@
                   <Component id="jButtonSelectCustomJaCoCoJar" alignment="3" min="-2" max="-2" attributes="0"/>
               </Group>
               <EmptySpace max="32767" attributes="0"/>
-              <Component id="jLabelWorkfilesTips" min="-2" pref="37" max="-2" attributes="0"/>
+              <Component id="jLabelWorkfilesTips" min="-2" max="-2" attributes="0"/>
               <EmptySpace type="unrelated" max="-2" attributes="0"/>
               <Group type="103" groupAlignment="0" attributes="0">
                   <Group type="103" groupAlignment="3" attributes="0">

diff --git a/tikione-jacocoverage-plugin/src/fr/tikione/jacocoverage/plugin/config/JaCoCoveragePanel.java b/tikione-jacocoverage-plugin/src/fr/tikione/jacocoverage/plugin/config/JaCoCoveragePanel.java
@@ -319,7 +319,7 @@ public void mouseClicked(MouseEvent evt) {
                     .addComponent(jLabelUseCustomJaCoCoJar)
                     .addComponent(jButtonSelectCustomJaCoCoJar))
                 .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                .addComponent(jLabelWorkfilesTips, GroupLayout.PREFERRED_SIZE, 37, GroupLayout.PREFERRED_SIZE)
+                .addComponent(jLabelWorkfilesTips, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
                 .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED)
                 .addGroup(layout.createParallelGroup(GroupLayout.Alignment.LEADING)
                     .addGroup(layout.createParallelGroup(GroupLayout.Alignment.BASELINE)
@@ -347,7 +347,7 @@ private void jButtonResoreDefaultsActionPerformed(ActionEvent evt) {//GEN-FIRST:
 		jCheckBoxEnableHighlightingExtended.setSelected(Globals.DEF_ENABLE_HIGHLIGHTEXTENDED);
 		jCheckBoxEnableHighlightingExtended.setEnabled(jCheckBoxEnableHighlighting.isSelected());
 		jCheckBoxUseBundledJaCoCoJar.setSelected(!Globals.DEF_USE_CUSTOM_JACOCO_JAR);
-		jTextFieldUseCustomJaCoCoJar.setText(Globals.DEF_CUSTOM_JACOCO_JAR_PATH);;
+		jTextFieldUseCustomJaCoCoJar.setText(Globals.DEF_CUSTOM_JACOCO_JAR_PATH);
 		jTextFieldUseCustomJaCoCoJar.setVisible(!jCheckBoxUseBundledJaCoCoJar.isSelected());
 		jButtonSelectCustomJaCoCoJar.setVisible(!jCheckBoxUseBundledJaCoCoJar.isSelected());
 		jLabelUseCustomJaCoCoJar.setVisible(!jCheckBoxUseBundledJaCoCoJar.isSelected());