Merge branch 'nb74dev'

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.6.0
-
+OpenIDE-Module-Specification-Version: 0.6.1
+OpenIDE-Module-Install: org/netbeans/modules/php/wordpress/WordPressModule.class

nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=c16cf6ec
+build.xml.data.CRC32=f6605689
 build.xml.script.CRC32=f6cbff90
 build.xml.stylesheet.CRC32=a56c6a5b@2.62.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=c16cf6ec
+nbproject/build-impl.xml.data.CRC32=f6605689
 nbproject/build-impl.xml.script.CRC32=bfa38a5f
 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.62.1

nbproject/project.xml

@@ -214,6 +214,14 @@
                         <specification-version>7.44.1</specification-version>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.openide.modules</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>7.39.1</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.openide.nodes</code-name-base>
                     <build-prerequisite/>
@@ -222,6 +230,14 @@
                         <specification-version>7.33.1</specification-version>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.openide.text</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.58.1</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.openide.util</code-name-base>
                     <build-prerequisite/>

src/org/netbeans/modules/php/wordpress/Bundle.properties

@@ -1,6 +1,6 @@
 OpenIDE-Module-Display-Category=PHP
 OpenIDE-Module-Long-Description=\
     Support for WordPress.This plugin provides the following features.\n\
-    <ul>\n<li>New Wordpress Project wizard</li>\n<li>Create theme(Underscores, Barebones) action</li>\n<li>Create plugin action</li>\n<li>Hyperlink navigation and code completion for filter and action function</li>\n<li>Shortcut nodes for theme and plugin directory</li>\n<li>Zip compress for your custom theme and plugin directory</li>\n</ul>
+    <ul>\n<li>New Wordpress Project wizard</li>\n<li>Create theme(Underscores, Barebones) action</li>\n<li>Create plugin action</li>\n<li>Hyperlink navigation and code completion for filter and action function</li>\n<li>Shortcut nodes for theme and plugin directory</li>\n<li>Zip compress for your custom theme and plugin directory</li>\n<li>wp-cli support</li>\n</ul>
 OpenIDE-Module-Name=PHP WordPress Blog/CMS
 OpenIDE-Module-Short-Description=Support for WordPress

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

@@ -0,0 +1,93 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2013 Sun Microsystems, Inc.
+ */
+package org.netbeans.modules.php.wordpress;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+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.StringUtils;
+import org.netbeans.modules.php.wordpress.commands.WordPressCli;
+import org.netbeans.modules.php.wordpress.ui.options.WordPressOptions;
+import org.openide.modules.ModuleInstall;
+import org.openide.util.NbBundle;
+import org.openide.util.RequestProcessor;
+
+/**
+ *
+ * @author junichi11
+ */
+public class WordPressModule extends ModuleInstall {
+
+    private static final Logger LOGGER = Logger.getLogger(WordPressModule.class.getName());
+
+    @NbBundle.Messages("WordPressModule.get.commands=Getting wp-cli commands...")
+    @Override
+    public void restored() {
+        super.restored();
+        WordPressOptions options = WordPressOptions.getInstance();
+        String wpCliPath = options.getWpCliPath();
+        if (!StringUtils.isEmpty(wpCliPath) && options.getWpCliGetCommandsOnBoot()) {
+            RequestProcessor.getDefault().post(new Runnable() {
+
+                @Override
+                public void run() {
+                    ProgressHandle handle = ProgressHandleFactory.createHandle(Bundle.WordPressModule_get_commands());
+                    try {
+                        handle.start();
+                        try {
+                            WordPressCli wpCli = WordPressCli.getDefault(false);
+                            wpCli.getCommands(false);
+                        } catch (InvalidPhpExecutableException ex) {
+                            LOGGER.log(Level.WARNING, ex.getLocalizedMessage());
+                        }
+
+                    } finally {
+                        handle.finish();
+                    }
+                }
+            });
+        }
+    }
+
+}

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

@@ -240,6 +240,8 @@ public Set<FileObject> extend(PhpModule pm) throws ExtendingException {
             } catch (ExecutionException ex) {
                 throw new ExtendingException(ex.getLocalizedMessage());
             }
+            // #18
+            sourceDirectory.refresh(true);
         } else {
             // do nothing
             return Collections.emptySet();

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

@@ -41,6 +41,13 @@
  */
 package org.netbeans.modules.php.wordpress.commands;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -93,6 +100,7 @@ public final class WordPressCli {
 
     // XXX default?
     private final List<String> DEFAULT_PARAMS = Collections.emptyList();
+    private static final List<FrameworkCommand> commandsCache = new ArrayList<FrameworkCommand>();
 
     private WordPressCli(String wpCliPath) {
         this.wpCliPath = wpCliPath;
@@ -162,18 +170,17 @@ public String getVersion() {
     /**
      * Get help.
      *
-     * @param phpModule
      * @param commands
      * @return help for command
      */
-    public String getHelp(PhpModule phpModule, List<String> commands) {
+    public String getHelp(List<String> commands) {
         List<String> params = new ArrayList<String>(commands.size() + 1);
         params.addAll(commands);
         params.add(HELP_PARAM);
 
         HelpLineProcessor helpLineProcessor = new HelpLineProcessor();
 
-        Future<Integer> result = getExecutable(phpModule)
+        Future<Integer> result = createExecutable()
                 .additionalParameters(params)
                 .run(getSilentDescriptor(), getOutputProcessorFactory(helpLineProcessor));
         try {
@@ -191,27 +198,74 @@ public String getHelp(PhpModule phpModule, List<String> commands) {
     /**
      * Get commands from help. Also get subcommands, so, take a little time.
      *
-     * @param phpModule
+     * @param isForce clear cache
      * @return commands
      */
     @NbBundle.Messages("WordPressCli.commands.empty=Please check whether config file and DB settings exist.")
-    public List<FrameworkCommand> getCommands(PhpModule phpModule) {
-        List<FrameworkCommand> commands = new ArrayList<FrameworkCommand>();
-        getCommands(phpModule, Collections.<String>emptyList(), commands);
-        if (commands.isEmpty()) {
+    public List<FrameworkCommand> getCommands(boolean isForce) {
+        if (!isForce && !commandsCache.isEmpty()) {
+            return commandsCache;
+        }
+        commandsCache.clear();
+        if (!isForce) {
+            // exists xml?
+            String commandList = WordPressOptions.getInstance().getWpCliCommandList();
+            if (!StringUtils.isEmpty(commandList)) {
+                try {
+                    File temp = File.createTempFile("nb-wpcli-tmp", ".xml"); // NOI18N
+                    try {
+                        FileOutputStream outputStream = new FileOutputStream(temp);
+                        PrintWriter pw = new PrintWriter(new OutputStreamWriter(outputStream, "UTF-8")); // NOI18N
+                        try {
+                            pw.println(commandList);
+                        } finally {
+                            pw.close();
+                        }
+
+                        // parse
+                        FileInputStream fileInputStream = new FileInputStream(temp);
+                        InputStreamReader inputStreamReader = new InputStreamReader(fileInputStream, "UTF-8"); // NOI18N
+                        WordPressCliCommandsXmlParser.parse(inputStreamReader, commandsCache);
+                    } finally {
+                        temp.deleteOnExit();
+                    }
+                } catch (IOException ex) {
+                    Exceptions.printStackTrace(ex);
+                }
+                if (!commandsCache.isEmpty()) {
+                    return commandsCache;
+                }
+            }
+        }
+
+        // update
+        updateCommands();
+
+        return commandsCache;
+    }
+
+    public void updateCommands() {
+        getCommands(Collections.<String>emptyList(), commandsCache);
+        if (commandsCache.isEmpty()) {
             NotifyDescriptor.Message message = new NotifyDescriptor.Message(Bundle.WordPressCli_commands_empty(), NotifyDescriptor.WARNING_MESSAGE);
             DialogDisplayer.getDefault().notify(message);
+        } else {
+            WordPressCliCommandListXmlBuilder builder = new WordPressCliCommandListXmlBuilder();
+            builder.build(commandsCache);
+            String commadlist = builder.asText();
+            if (!StringUtils.isEmpty(commadlist)) {
+                WordPressOptions.getInstance().setWpCliCommandList(commadlist);
+            }
         }
-        return commands;
     }
 
     // XXX get help later?
-    private void getCommands(PhpModule phpModule, List<String> subcommands, List<FrameworkCommand> commands) {
+    private void getCommands(List<String> subcommands, List<FrameworkCommand> commands) {
         ArrayList<String> params = new ArrayList<String>(subcommands.size() + 1);
         params.add(HELP_COMMAND);
         params.addAll(subcommands);
         HelpLineProcessor helpLineProcessor = new HelpLineProcessor();
-        Future<Integer> result = getExecutable(phpModule)
+        Future<Integer> result = createExecutable()
                 .additionalParameters(params)
                 .run(getSilentDescriptor(), getOutputProcessorFactory(helpLineProcessor));
         try {
@@ -249,11 +303,11 @@ private void getCommands(PhpModule phpModule, List<String> subcommands, List<Fra
                 ArrayList<String> nextSubcommands = new ArrayList<String>(subcommands.size() + 1);
                 nextSubcommands.addAll(subcommands);
                 nextSubcommands.add(subcommand);
-                String help = getHelp(phpModule, nextSubcommands);
+                String help = getHelp(nextSubcommands);
                 commands.add(new WordPressCliCommand(nextSubcommands.toArray(new String[]{}), description, help)); // NOI18N
 
                 // recursive
-                getCommands(phpModule, nextSubcommands, commands);
+                getCommands(nextSubcommands, commands);
             }
 
             if (line.toLowerCase().startsWith("subcommands")) { // NOI18N

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

@@ -0,0 +1,57 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2013 Sun Microsystems, Inc.
+ */
+package org.netbeans.modules.php.wordpress.commands;
+
+import java.util.List;
+import org.netbeans.modules.php.spi.framework.commands.FrameworkCommand;
+
+/**
+ *
+ * @author junichi11
+ */
+public interface WordPressCliCommandListBuilder {
+
+    public void build(List<FrameworkCommand> commands);
+
+    public String asText();
+
+}