Fix notification link for updating #47

Author: junichi11

src/org/netbeans/modules/php/wordpress/update/UpgradeUtils.java

@@ -0,0 +1,65 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2015 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 2015 Sun Microsystems, Inc.
+ */
+package org.netbeans.modules.php.wordpress.update;
+
+import org.openide.DialogDisplayer;
+import org.openide.NotifyDescriptor;
+import org.openide.util.NbBundle;
+
+/**
+ *
+ * @author junichi11
+ */
+public final class UpgradeUtils {
+
+    private UpgradeUtils() {
+    }
+
+    @NbBundle.Messages("UpgradeUtils.invalid.wpcli.message=Not found wp-cli: You can update the WordPress using the update command of wp-cli from this link if wp-cli path and locale are set to the Options.")
+    public static void showInvalidWpCliDialog() {
+        NotifyDescriptor.Message message = new NotifyDescriptor.Message(
+                Bundle.UpgradeUtils_invalid_wpcli_message(),
+                NotifyDescriptor.INFORMATION_MESSAGE
+        );
+        DialogDisplayer.getDefault().notify(message);
+    }
+}

src/org/netbeans/modules/php/wordpress/update/WordPressCoreUpgradeChecker.java

@@ -45,6 +45,7 @@
 import java.awt.event.ActionListener;
 import java.io.IOException;
 import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.Collections;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
@@ -60,6 +61,7 @@
 import org.netbeans.modules.php.wordpress.wpapis.WordPressVersionCheckApi;
 import org.openide.DialogDisplayer;
 import org.openide.NotifyDescriptor;
+import org.openide.awt.HtmlBrowser;
 import org.openide.awt.NotificationDisplayer;
 import org.openide.util.Exceptions;
 import org.openide.util.ImageUtilities;
@@ -74,6 +76,7 @@
 public final class WordPressCoreUpgradeChecker implements WordPressUpgradeChecker {
 
     private String upgradeVersionNumber;
+    private String downloadUrl;
     private static final Logger LOGGER = Logger.getLogger(WordPressCoreUpgradeChecker.class.getName());
 
     public WordPressCoreUpgradeChecker() {
@@ -90,6 +93,7 @@ public boolean hasUpgrade(PhpModule phpModule) {
                 WordPressVersionCheckApi versionCheckApi = new WordPressVersionCheckApi();
                 versionCheckApi.parse();
                 upgradeVersionNumber = versionCheckApi.getVersion();
+                downloadUrl = versionCheckApi.getDownload();
                 if (StringUtils.isEmpty(upgradeVersionNumber)) {
                     // XXX throw exception?
                     return false;
@@ -149,17 +153,18 @@ private boolean hasUpgrade(WordPressVersion version) throws NumberFormatExceptio
         "WordPressCoreUpgradeChecker.core.notify.title=Notification({0}): New version is available",
         "# {0} - version number",
         "# {1} - display name",
-        "WordPressCoreUpgradeChecker.core.notify.detail=New core version is available: {0} ({1})",})
+        "WordPressCoreUpgradeChecker.core.notify.detail=New core version is available: {0} ({1})"
+    })
     @Override
     public void notifyUpgrade(PhpModule phpModule) {
-        if (StringUtils.isEmpty(upgradeVersionNumber)) {
+        if (StringUtils.isEmpty(upgradeVersionNumber) || StringUtils.isEmpty(downloadUrl)) {
             return;
         }
         NotificationDisplayer.getDefault().notify(
                 Bundle.WordPressCoreUpgradeChecker_core_notify_title(phpModule.getDisplayName()),
                 ImageUtilities.loadImageIcon(WordPress.WP_ICON_16, false),
                 Bundle.WordPressCoreUpgradeChecker_core_notify_detail(upgradeVersionNumber, phpModule.getDisplayName()),
-                new CoreUpdateActionListener(phpModule)
+                new CoreUpdateActionListener(phpModule, downloadUrl)
         );
     }
 
@@ -171,15 +176,36 @@ public String getUpgradeVersionNumber() {
     private static class CoreUpdateActionListener implements ActionListener {
 
         private final PhpModule phpModule;
+        private final String downloadUrl;
 
-        public CoreUpdateActionListener(PhpModule phpModule) {
+        public CoreUpdateActionListener(PhpModule phpModule, String downloadUrl) {
             this.phpModule = phpModule;
+            this.downloadUrl = downloadUrl;
         }
 
-        @NbBundle.Messages("CoreUpdateActionListener.comfirmation=Do you want to update? (run wp core update, update-db)")
+        @NbBundle.Messages({
+            "CoreUpdateActionListener.comfirmation=Do you want to update? (run wp core update, update-db)",
+            "# {0} - download url",
+            "CoreUpdateActionListener.download.zip.confirmation=<html><p>Dou you want to download the zip file({0}) on the browsser?</p>"
+            + "<b>NOTE:</b> You can also update the WP using the update command of wp-cli if you set wp-cli to the Options"
+        })
         @Override
         public void actionPerformed(ActionEvent e) {
             if (StringUtils.isEmpty(WordPressOptions.getInstance().getWpCliPath())) {
+                // show dialog
+                NotifyDescriptor.Confirmation message = new NotifyDescriptor.Confirmation(
+                        Bundle.CoreUpdateActionListener_download_zip_confirmation(downloadUrl),
+                        NotifyDescriptor.QUESTION_MESSAGE
+                );
+                if (DialogDisplayer.getDefault().notify(message) == NotifyDescriptor.OK_OPTION) {
+                    if (!StringUtils.isEmpty(downloadUrl)) {
+                        try {
+                            HtmlBrowser.URLDisplayer.getDefault().showURL(new URL(downloadUrl));
+                        } catch (MalformedURLException ex) {
+                            Exceptions.printStackTrace(ex);
+                        }
+                    }
+                }
                 return;
             }
 
@@ -207,11 +233,7 @@ public void run() {
                         if (result != null) {
                             result.get();
                         }
-                    } catch (InvalidPhpExecutableException ex) {
-                        Exceptions.printStackTrace(ex);
-                    } catch (InterruptedException ex) {
-                        Exceptions.printStackTrace(ex);
-                    } catch (ExecutionException ex) {
+                    } catch (InvalidPhpExecutableException | InterruptedException | ExecutionException ex) {
                         Exceptions.printStackTrace(ex);
                     }
                 }

src/org/netbeans/modules/php/wordpress/update/WordPressPluginUpgradeChecker.java

@@ -150,6 +150,7 @@ public PluginUpdateActionListener(PhpModule phpModule) {
         @Override
         public void actionPerformed(ActionEvent e) {
             if (StringUtils.isEmpty(WordPressOptions.getInstance().getWpCliPath())) {
+                UpgradeUtils.showInvalidWpCliDialog();
                 return;
             }
 

src/org/netbeans/modules/php/wordpress/update/WordPressThemeUpgradeChecker.java

@@ -150,6 +150,7 @@ public ThemeUpdateActionListener(PhpModule phpModule) {
         @Override
         public void actionPerformed(ActionEvent e) {
             if (StringUtils.isEmpty(WordPressOptions.getInstance().getWpCliPath())) {
+                UpgradeUtils.showInvalidWpCliDialog();
                 return;
             }