Merge branch 'nb81'

Conflicts:
	manifest.mf

Author: junichi11

manifest.mf

@@ -1,5 +1,4 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.php.phpcsfixer
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/phpcsfixer/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.4.3
-
+OpenIDE-Module-Specification-Version: 0.5.2

nbproject/project.xml

@@ -102,6 +102,14 @@
                         <specification-version>8.5.1</specification-version>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.openide.filesystems.nb</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>9.6.1</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.openide.loaders</code-name-base>
                     <build-prerequisite/>
@@ -142,6 +150,14 @@
                         <specification-version>8.19.1</specification-version>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.openide.util.ui</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>9.3.1</specification-version>
+                    </run-dependency>
+                </dependency>
             </module-dependencies>
             <public-packages/>
         </data>

src/org/netbeans/modules/php/phpcsfixer/options/PhpCsFixerPanel.java

@@ -305,10 +305,7 @@ public String getPath() {
     boolean valid() {
         // TODO check whether form is consistent and complete
         String path = pathTextField.getText();
-        if (StringUtils.isEmpty(path)) {
-            return false;
-        }
-        return true;
+        return !StringUtils.isEmpty(path);
     }
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JButton browseButton;
@@ -330,10 +327,7 @@ public boolean accept(File f) {
                 return true;
             }
             String name = f.getName();
-            if (f.isFile() && name.startsWith(PhpCsFixer.NAME)) {
-                return true;
-            }
-            return false;
+            return f.isFile() && name.startsWith(PhpCsFixer.NAME);
         }
 
         @Override

src/org/netbeans/modules/php/phpcsfixer/ui/actions/PhpCsFixerActionsFactory.java

@@ -71,7 +71,7 @@
     @ActionReference(path = "Loaders/folder/any/Actions", position = 1600),
     @ActionReference(path = "Loaders/text/x-php5/Actions", position = 1600),
     @ActionReference(path = "Editors/text/x-php5/Popup", position = 600),
-    @ActionReference(path = "Projects/org-netbeans-modules-php-phpproject/Actions", position = 1100)
+    @ActionReference(path = "Projects/org-netbeans-modules-php-project/Actions", position = 1100)
 })
 @NbBundle.Messages("PhpCsFixerActionsFactory.name=PHP CS Fixer")
 public class PhpCsFixerActionsFactory extends AbstractAction implements Presenter.Popup {
@@ -108,10 +108,7 @@ private boolean isInPhpModule() {
             return false;
         }
         PhpModule phpModule = PhpModule.Factory.forFileObject(target);
-        if (phpModule == null) {
-            return false;
-        }
-        return true;
+        return phpModule != null;
     }
 
     //~ inner class