Merge branch 'pr-63'

Author: adangel

ReleaseNotes.md

@@ -27,6 +27,7 @@ Eclipse Update Site:
 *   [#53](https://github.com/pmd/pmd-eclipse-plugin/pull/53): README: markdown, fix links - [Lars Hvam](https://github.com/larshp)
 *   [#60](https://github.com/pmd/pmd-eclipse-plugin/pull/60): Update to PMD 6.7.0 - [Jan](https://github.com/jgerken)
 *   [#61](https://github.com/pmd/pmd-eclipse-plugin/pull/61): Support Eclipse SimRel 2018-09 - [jftsunami](https://github.com/jftsunami)
+*   [#63](https://github.com/pmd/pmd-eclipse-plugin/pull/63): Minor changes - [jftsunami](https://github.com/jftsunami)
 
 
 ## 01-August-2018: 4.0.17.v20180801-1551

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/PMDPreferencePage.java

@@ -574,7 +574,7 @@ public void widgetSelected(SelectionEvent event) {
                             flContinue = input.open() == InputDialog.OK;
                         }
 
-                        if (flContinue) {
+                        if (flContinue && input != null) {
                             ruleSet = RuleSetUtil.setNameDescription(ruleSet,
                                     getFileNameWithoutExtension(file.getName()), input.getValue());
                             OutputStream out = new FileOutputStream(fileName);

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/br/RuleTableManager.java

@@ -398,7 +398,7 @@ private void exportTo(String fileName, Shell shell) throws FileNotFoundException
             flContinue = input.open() == Window.OK;
         }
 
-        if (flContinue) {
+        if (flContinue && input != null) {
             OutputStream out = null;
             try {
                 ruleSet = RuleSetUtil.setNameDescription(ruleSet, FileUtil.getFileNameWithoutExtension(file.getName()),

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/panelmanagers/RulePanelManager.java

@@ -146,7 +146,7 @@ private void showLanguageVersionFields(Language language) {
         minLanguageVersionCombo.setVisible(hasVersions);
         maxLanguageVersionCombo.setVisible(hasVersions);
 
-        if (hasVersions) {
+        if (hasVersions && language != null) {
             List<LanguageVersion> versions = new ArrayList<LanguageVersion>();
             versions.add(null); // allow no selection
             versions.addAll(language.getVersions());

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/properties/PMDProjectPropertyPage.java

@@ -42,6 +42,7 @@
 import java.util.Comparator;
 import java.util.List;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -414,7 +415,7 @@ public void widgetSelected(SelectionEvent e) {
                     files.add(buf.toString());
                 }
                 if (path != null) {
-                    ruleSetFileText.setText(String.join(",", files));
+                    ruleSetFileText.setText(StringUtils.join(files, ","));
                 }
             }
         });