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.4
+OpenIDE-Module-Specification-Version: 0.9.5
 OpenIDE-Module-Install: org/netbeans/modules/php/wordpress/WordPressModuleInstall.class

nbproject/project.properties

@@ -1,4 +1,4 @@
-javac.source=1.7
+javac.source=1.8
 javac.compilerargs=-Xlint -Xlint:-serial
 license.file=license.txt
 nbm.module.author=junichi11

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

@@ -41,13 +41,17 @@
  */
 package org.netbeans.modules.php.wordpress;
 
+import org.netbeans.api.annotations.common.StaticResource;
+
 /**
  *
  * @author junichi11
  */
 public final class WordPress {
 
+    @StaticResource
     public static final String WP_ICON_8 = "org/netbeans/modules/php/wordpress/resources/wordpress_icon_8.png"; // NOI18N
+    @StaticResource
     public static final String WP_ICON_16 = "org/netbeans/modules/php/wordpress/resources/wordpress_icon_16.png"; // NOI18N
 
     private WordPress() {

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

@@ -1,44 +1,4 @@
 /*
- * 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.
- *//*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright 2013 Oracle and/or its affiliates. All rights reserved.
@@ -108,23 +68,18 @@ public void 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 = ProgressHandle.createHandle(Bundle.WordPressModule_get_commands());
+            RequestProcessor.getDefault().post(() -> {
+                ProgressHandle handle = ProgressHandle.createHandle(Bundle.WordPressModule_get_commands());
+                try {
+                    handle.start();
                     try {
-                        handle.start();
-                        try {
-                            WordPressCli wpCli = WordPressCli.getDefault(false);
-                            wpCli.getCommands(false);
-                        } catch (InvalidPhpExecutableException ex) {
-                            LOGGER.log(Level.WARNING, ex.getLocalizedMessage());
-                        }
-
-                    } finally {
-                        handle.finish();
+                        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/WordPressPhpProvider.java

@@ -48,6 +48,7 @@
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
+import org.netbeans.api.annotations.common.StaticResource;
 import org.netbeans.modules.php.api.framework.BadgeIcon;
 import org.netbeans.modules.php.api.phpmodule.PhpModule;
 import org.netbeans.modules.php.api.phpmodule.PhpModuleProperties;
@@ -83,6 +84,7 @@ public class WordPressPhpProvider extends PhpFrameworkProvider {
 
     private static final RequestProcessor RP = new RequestProcessor(WordPressPhpProvider.class);
     private static final WordPressPhpProvider INSTANCE = new WordPressPhpProvider();
+    @StaticResource
     private static final String ICON_PATH = "org/netbeans/modules/php/wordpress/resources/wordpress_badge_8.png"; // NOI18N
     private final BadgeIcon badgeIcon;
     public static final Set<String> WP_DIRS = new HashSet<>();

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

@@ -54,11 +54,16 @@
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
+import static java.util.logging.Level.FINE;
+import static java.util.logging.Level.INFO;
 import java.util.logging.Logger;
+import static java.util.logging.Level.WARNING;
+import java.util.regex.Pattern;
 import org.netbeans.api.extexecution.ExecutionDescriptor;
 import org.netbeans.api.extexecution.base.input.InputProcessor;
 import org.netbeans.api.extexecution.base.input.InputProcessors;
 import org.netbeans.api.extexecution.base.input.LineProcessor;
+import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.modules.php.api.executable.InvalidPhpExecutableException;
 import org.netbeans.modules.php.api.executable.PhpExecutable;
 import org.netbeans.modules.php.api.executable.PhpExecutableValidator;
@@ -109,18 +114,24 @@ public final class WordPressCli {
 
     // XXX default?
     private final List<String> DEFAULT_PARAMS = Collections.emptyList();
-    private static final List<FrameworkCommand> commandsCache = new ArrayList<>();
+    private static final List<FrameworkCommand> COMMANDS_CACHE = new ArrayList<>();
+
+    private static final Pattern WHITESPACES_PATTERN = Pattern.compile(" +"); // NOI18N
 
     private WordPressCli(String wpCliPath) {
         this.wpCliPath = wpCliPath;
     }
 
+    public static WordPressCli getDefault(boolean warn) throws InvalidPhpExecutableException {
+        String wpCliPath = WordPressOptions.getInstance().getWpCliPath();
+        return newInstance(wpCliPath, warn);
+    }
+
     @NbBundle.Messages({
         "# {0} - error message",
         "WordPressCli.invalid.wpcli.script=<html>wp-cli is not valid.<br>({0})"
     })
-    public static WordPressCli getDefault(boolean warn) throws InvalidPhpExecutableException {
-        String wpCliPath = WordPressOptions.getInstance().getWpCliPath();
+    public static WordPressCli newInstance(String wpCliPath, boolean warn) throws InvalidPhpExecutableException {
         String error = validate(wpCliPath);
         if (error == null) {
             return new WordPressCli(wpCliPath);
@@ -229,7 +240,7 @@ public String getVersion() {
         } catch (InterruptedException ex) {
             Thread.currentThread().interrupt();
         } catch (ExecutionException ex) {
-            Exceptions.printStackTrace(ex);
+            LOGGER.log(WARNING, null, ex);
         }
         return helpLineProcessor.getHelp();
     }
@@ -318,10 +329,10 @@ public String getHelp(List<String> commands) {
      */
     @NbBundle.Messages("WordPressCli.commands.empty=Please check whether config file and DB settings exist.")
     public List<FrameworkCommand> getCommands(boolean isForce) {
-        if (!isForce && !commandsCache.isEmpty()) {
-            return commandsCache;
+        if (!isForce && !COMMANDS_CACHE.isEmpty()) {
+            return COMMANDS_CACHE;
         }
-        commandsCache.clear();
+        COMMANDS_CACHE.clear();
         if (!isForce) {
             // exists xml?
             String commandList = WordPressOptions.getInstance().getWpCliCommandList();
@@ -330,53 +341,61 @@ public List<FrameworkCommand> getCommands(boolean isForce) {
                     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 {
+                        try (PrintWriter pw = new PrintWriter(new OutputStreamWriter(outputStream, "UTF-8"))) { // NOI18N
                             pw.println(commandList);
-                        } finally {
-                            pw.close();
                         }
 
                         // parse
                         FileInputStream fileInputStream = new FileInputStream(temp);
                         InputStreamReader inputStreamReader = new InputStreamReader(fileInputStream, "UTF-8"); // NOI18N
-                        WordPressCliCommandsXmlParser.parse(inputStreamReader, commandsCache);
+                        WordPressCliCommandsXmlParser.parse(inputStreamReader, COMMANDS_CACHE);
                     } finally {
                         temp.deleteOnExit();
                     }
                 } catch (IOException ex) {
-                    Exceptions.printStackTrace(ex);
+                    LOGGER.log(WARNING, null, ex);
                 }
-                if (!commandsCache.isEmpty()) {
-                    return commandsCache;
+                if (!COMMANDS_CACHE.isEmpty()) {
+                    return COMMANDS_CACHE;
                 }
             }
         }
 
         // update
         updateCommands();
 
-        return commandsCache;
+        return COMMANDS_CACHE;
     }
 
+    @NbBundle.Messages("WordPressCli.update.command.progress=Updating wp-cli commands...")
     public void updateCommands() {
-        commandsCache.clear();
-        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);
+        ProgressHandle handle = ProgressHandle.createHandle(Bundle.WordPressCli_update_command_progress());
+        try {
+            handle.start();
+            long startTime = System.currentTimeMillis();
+            COMMANDS_CACHE.clear();
+            getCommands(Collections.<String>emptyList(), COMMANDS_CACHE, handle);
+            if (COMMANDS_CACHE.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(COMMANDS_CACHE);
+                String commadlist = builder.asText();
+                if (!StringUtils.isEmpty(commadlist)) {
+                    WordPressOptions.getInstance().setWpCliCommandList(commadlist);
+                }
             }
+            long endTime = System.currentTimeMillis();
+            LOGGER.log(INFO, "Update Commands: took {0}ms", endTime - startTime); // NOI18N
+            LOGGER.log(INFO, "{0} wp-cli commands.", COMMANDS_CACHE.size()); // NOI18N
+        } finally {
+            handle.finish();
         }
     }
 
     // XXX get help later?
-    private void getCommands(List<String> subcommands, List<FrameworkCommand> commands) {
+    private void getCommands(List<String> subcommands, List<FrameworkCommand> commands, ProgressHandle handle) {
         ArrayList<String> params = new ArrayList<>(subcommands.size() + 1);
         params.add(HELP_COMMAND);
         params.addAll(subcommands);
@@ -389,14 +408,18 @@ private void getCommands(List<String> subcommands, List<FrameworkCommand> comman
                 result.get();
             }
         } catch (InterruptedException ex) {
-            Exceptions.printStackTrace(ex);
+            Thread.currentThread().interrupt();
         } catch (ExecutionException ex) {
-            Exceptions.printStackTrace(ex);
+            LOGGER.log(WARNING, null, ex);
         }
         List<String> lines = helpLineProcessor.asLines();
 
         boolean isSubcommands = false;
         boolean isFirstEmpty = false;
+        LOGGER.log(FINE, "{0} WP Command", StringUtils.implode(subcommands, " ")); // NOI18N
+        if (handle != null) {
+            handle.progress(StringUtils.implode(subcommands, " ")); // NOI18N
+        }
         for (String line : lines) {
             if (isSubcommands) {
                 if (StringUtils.isEmpty(line)) {
@@ -406,8 +429,13 @@ private void getCommands(List<String> subcommands, List<FrameworkCommand> comman
                     isFirstEmpty = true;
                     continue;
                 }
+                // XXX just ignore
+                // in the case of long description
+                if (line.startsWith("   ")) { // NOI18N
+                    continue;
+                }
                 line = line.trim();
-                line = line.replaceAll(" +", " "); // NOI18N
+                line = WHITESPACES_PATTERN.matcher(line).replaceAll(" "); // NOI18N
                 int indexOf = line.indexOf(" "); // NOI18N
                 if (indexOf == -1) {
                     continue;
@@ -422,8 +450,8 @@ private void getCommands(List<String> subcommands, List<FrameworkCommand> comman
                 String help = getHelp(nextSubcommands);
                 commands.add(new WordPressCliCommand(nextSubcommands.toArray(new String[]{}), description, help)); // NOI18N
 
-                // recursive
-                getCommands(nextSubcommands, commands);
+                // get commands recursively
+                getCommands(nextSubcommands, commands, handle);
             }
 
             if (line.toLowerCase().startsWith("subcommands")) { // NOI18N
@@ -537,12 +565,7 @@ private List<String> getAllParameters(List<String> parameters) {
      * @return InputProcessorFactory
      */
     private ExecutionDescriptor.InputProcessorFactory2 getOutputProcessorFactory(final LineProcessor lineProcessor) {
-        return new ExecutionDescriptor.InputProcessorFactory2() {
-            @Override
-            public InputProcessor newInputProcessor(InputProcessor defaultProcessor) {
-                return InputProcessors.ansiStripping(InputProcessors.bridge(lineProcessor));
-            }
-        };
+        return (InputProcessor defaultProcessor) -> InputProcessors.ansiStripping(InputProcessors.bridge(lineProcessor));
     }
 
     @NbBundle.Messages({

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

@@ -135,21 +135,17 @@ protected void actionPerformed(PhpModule phpModule) {
         Collections.sort(themes);
 
         // show dialog
-        SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                getDescriptor().setValid(false);
-                DialogDisplayer displayer = DialogDisplayer.getDefault();
-                if (displayer.notify(getDescriptor()) == DialogDescriptor.OK_OPTION) {
-                    try {
-                        createChildTheme(themesDirectory);
-                    } catch (IOException ex) {
-                        Exceptions.printStackTrace(ex);
-                    }
+        SwingUtilities.invokeLater(() -> {
+            getDescriptor().setValid(false);
+            DialogDisplayer displayer = DialogDisplayer.getDefault();
+            if (displayer.notify(getDescriptor()) == DialogDescriptor.OK_OPTION) {
+                try {
+                    createChildTheme(themesDirectory);
+                } catch (IOException ex) {
+                    Exceptions.printStackTrace(ex);
                 }
-                clear();
             }
+            clear();
         });
     }
 

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

@@ -128,17 +128,14 @@ protected void actionPerformed(PhpModule phpModule) {
         );
 
         // add ChangeListener
-        ChangeListener changeListener = new ChangeListener() {
-            @Override
-            public void stateChanged(ChangeEvent e) {
-                String themeDirectoryName = panel.getThemeDirectoryName();
-                boolean existsDirectory = themes.contains(themeDirectoryName);
-                dialogDescriptor.setValid(!existsDirectory);
-                if (existsDirectory) {
-                    panel.setErrorMessage(Bundle.CreateMinimumBlankThemeAction_existing_directoryName());
-                } else {
-                    panel.setErrorMessage(" "); // NOI18N
-                }
+        ChangeListener changeListener = (ChangeEvent e) -> {
+            String themeDirectoryName = panel.getThemeDirectoryName();
+            boolean existsDirectory = themes.contains(themeDirectoryName);
+            dialogDescriptor.setValid(!existsDirectory);
+            if (existsDirectory) {
+                panel.setErrorMessage(Bundle.CreateMinimumBlankThemeAction_existing_directoryName());
+            } else {
+                panel.setErrorMessage(" "); // NOI18N
             }
         };
         panel.addChangeListener(changeListener);