Merge branch 'nb82dev'

Author: junichi11

manifest.mf

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.php.wordpress
 OpenIDE-Module-Layer: org/netbeans/modules/php/wordpress/resources/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/wordpress/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.9.3
+OpenIDE-Module-Specification-Version: 0.9.4
 OpenIDE-Module-Install: org/netbeans/modules/php/wordpress/WordPressModuleInstall.class

src/org/netbeans/modules/php/wordpress/WordPressActionsExtender.java

@@ -44,17 +44,14 @@
 import java.util.ArrayList;
 import java.util.List;
 import javax.swing.Action;
-import org.netbeans.modules.php.api.util.StringUtils;
 import org.netbeans.modules.php.spi.framework.PhpModuleActionsExtender;
 import org.netbeans.modules.php.spi.framework.actions.RunCommandAction;
-import org.netbeans.modules.php.wordpress.commands.WordPressCli;
 import org.netbeans.modules.php.wordpress.ui.actions.CreateChildThemeAction;
 import org.netbeans.modules.php.wordpress.ui.actions.CreatePermalinkHtaccessAction;
 import org.netbeans.modules.php.wordpress.ui.actions.CreatePluginAction;
 import org.netbeans.modules.php.wordpress.ui.actions.CreateThemeAction;
 import org.netbeans.modules.php.wordpress.ui.actions.RefreshCodeCompletionAction;
 import org.netbeans.modules.php.wordpress.ui.actions.WordPressRunCommandAction;
-import org.netbeans.modules.php.wordpress.ui.options.WordPressOptions;
 import org.openide.util.NbBundle;
 
 /**
@@ -71,15 +68,7 @@ public String getMenuName() {
 
     @Override
     public RunCommandAction getRunCommandAction() {
-        // If wp-cli path is invalid, run command action is not added to context menu.
-        String wpCliPath = WordPressOptions.getInstance().getWpCliPath();
-        if (StringUtils.isEmpty(wpCliPath)) {
-            return null;
-        }
-        String error = WordPressCli.validate(wpCliPath);
-        if (error != null) {
-            return null;
-        }
+        // wp-cli path is validated when the Run Command action is run
         return WordPressRunCommandAction.getInstance();
     }
 

src/org/netbeans/modules/php/wordpress/commands/WordPressCli.java

@@ -81,8 +81,9 @@
  */
 public final class WordPressCli {
 
-    public static String NAME = "wp"; // NOI18N
-    public static String LONG_NAME = "wp-cli.phar"; // NOI18N
+    public static final String NAME = "wp"; // NOI18N
+    public static final String LONG_NAME = "wp-cli.phar"; // NOI18N
+    public static final String NAME_BAT = "wp.bat"; // NOI18N
 
     private final String wpCliPath;
     private boolean noReset = false;

src/org/netbeans/modules/php/wordpress/ui/actions/WordPressRunCommandAction.java

@@ -41,10 +41,16 @@
  */
 package org.netbeans.modules.php.wordpress.ui.actions;
 
+import org.netbeans.api.options.OptionsDisplayer;
 import org.netbeans.modules.php.api.phpmodule.PhpModule;
+import org.netbeans.modules.php.api.util.StringUtils;
 import org.netbeans.modules.php.spi.framework.actions.RunCommandAction;
 import org.netbeans.modules.php.wordpress.WordPressPhpProvider;
+import org.netbeans.modules.php.wordpress.commands.WordPressCli;
+import org.netbeans.modules.php.wordpress.ui.options.WordPressOptions;
 import org.netbeans.modules.php.wordpress.util.WPUtils;
+import org.openide.DialogDisplayer;
+import org.openide.NotifyDescriptor;
 import org.openide.util.NbBundle;
 
 /**
@@ -54,6 +60,7 @@
 public class WordPressRunCommandAction extends RunCommandAction {
 
     private static final WordPressRunCommandAction INSTANCE = new WordPressRunCommandAction();
+    private static final long serialVersionUID = 158739462398606689L;
 
     private WordPressRunCommandAction() {
     }
@@ -67,6 +74,16 @@ public void actionPerformed(PhpModule phpModule) {
         if (!WPUtils.isWP(phpModule)) {
             return;
         }
+        String wpCliPath = WordPressOptions.getInstance().getWpCliPath();
+        if (StringUtils.isEmpty(wpCliPath)) {
+            openOptionsPanel(Bundle.WordPressRunCommandAction_message_no_wp_cli());
+            return;
+        }
+        String error = WordPressCli.validate(wpCliPath);
+        if (error != null) {
+            openOptionsPanel(Bundle.WordPressRunCommandAction_message_invalid_wp_cli());
+            return;
+        }
         WordPressPhpProvider.getInstance().getFrameworkCommandSupport(phpModule).openPanel();
     }
 
@@ -79,4 +96,17 @@ protected String getFullName() {
         return Bundle.WordPressRunCommandAction_name(getPureName());
     }
 
+    @NbBundle.Messages({
+        "WordPressRunCommandAction.message.no.wp-cli=Please set wp-cli path.",
+        "WordPressRunCommandAction.message.invalid.wp-cli=Please set valid wp-cli path."
+    })
+    private void openOptionsPanel(String errorMessage) {
+        NotifyDescriptor.Message message = new NotifyDescriptor.Message(
+                errorMessage,
+                NotifyDescriptor.ERROR_MESSAGE
+        );
+        DialogDisplayer.getDefault().notify(message);
+        OptionsDisplayer.getDefault().open(WordPressOptions.getOptionsPath());
+    }
+
 }

src/org/netbeans/modules/php/wordpress/ui/options/WordPressOptions.java

@@ -70,7 +70,7 @@ private WordPressOptions() {
     }
 
     public static String getOptionsPath() {
-        return UiUtils.OPTIONS_PATH + "/" + WordPressOptions.OPTIONS_SUBPATH; // NOI18N
+        return UiUtils.FRAMEWORKS_AND_TOOLS_OPTIONS_PATH + "/" + WordPressOptions.OPTIONS_SUBPATH; // NOI18N
     }
 
     public static WordPressOptions getInstance() {

src/org/netbeans/modules/php/wordpress/ui/options/WordPressOptionsPanel.java

@@ -55,7 +55,6 @@
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 import org.netbeans.api.progress.ProgressHandle;
-import org.netbeans.api.progress.ProgressHandleFactory;
 import org.netbeans.modules.php.api.executable.InvalidPhpExecutableException;
 import org.netbeans.modules.php.api.util.FileUtils;
 import org.netbeans.modules.php.api.util.StringUtils;
@@ -69,6 +68,7 @@
 import org.openide.util.Exceptions;
 import org.openide.util.NbBundle;
 import org.openide.util.RequestProcessor;
+import org.openide.util.Utilities;
 
 final class WordPressOptionsPanel extends javax.swing.JPanel {
 
@@ -537,6 +537,9 @@ private void wpCliSearchButtonActionPerformed(java.awt.event.ActionEvent evt) {/
         String script = UiUtils.SearchWindow.search(new UiUtils.SearchWindow.SearchWindowSupport() {
             @Override
             public List<String> detect() {
+                if (Utilities.isWindows()) {
+                    return FileUtils.findFileOnUsersPath(WordPressCli.NAME, WordPressCli.LONG_NAME, WordPressCli.NAME_BAT);
+                }
                 return FileUtils.findFileOnUsersPath(WordPressCli.NAME, WordPressCli.LONG_NAME);
             }