Merge branch 'nb74dev'

Author: junichi11

README.md

@@ -15,10 +15,11 @@ This is NetBeans plugin for WordPress.
 - display and change debug status
 - code completion for filter and action
 - create new theme action
-- hyperlink navigate
+- hyperlink navigation
 - create new plugin action
 - custom content name
 - run command (wp-cli)
+- upgrade notification
 
 ### Impotant Files
 It contains wp-config.php
@@ -71,6 +72,7 @@ add_filter('the_content', 'w[Ctrl + Space]'); // e.g. start with 'w'
 ### Display And Change Debug Status
 WP_DEBUG value(wp-config.php) is displayed on bottome-right of IDE. 
 If you click there, you can change WP_DEBUG value.
+WordPress version number is also displayed.
 
 ### Create New Theme Action
 Right-click Project > WordPress > Create Theme
@@ -116,5 +118,31 @@ Please see the followings:
 - https://github.com/wp-cli/wp-cli
 - http://wp-cli.org/
 
+### Upgrade Notification
+
+Check whether new versions (for core, plugin and theme) are available when WordPress project is opened.
+Furthermore, we can upgrade(run core update, core update-db, e.t.c.) WordPress with notification window if we are setting wp-cli.
+
+If you don't want to check that, please uncheck `Check new version when project is opened` at Options.
+
+## Version Number
+
+|       |stable |dev      |
+|:------|:-----:|:-------:|
+|pattern| n.n.n | n.n.n.n |
+|e.g.   | 1.0.1 | 1.0.1.2 |
+
+### Stable version
+
+Available on [Plugin Portal](http://plugins.netbeans.org/plugin/46542/php-wordpress-blog-cms).
+
+### Development version
+
+If development version exists, it will be available in the same archive as stable version.
+
+### Archive
+
+[github releases](https://github.com/junichi11/netbeans-wordpress-plugin/releases)
+
 ## License
 [Common Development and Distribution License (CDDL) v1.0 and GNU General Public License (GPL) v2](http://netbeans.org/cddl-gplv2.html)

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

nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=f6605689
+build.xml.data.CRC32=afe7c087
 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=f6605689
+nbproject/build-impl.xml.data.CRC32=afe7c087
 nbproject/build-impl.xml.script.CRC32=bfa38a5f
 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.62.1

nbproject/project.xml

@@ -6,6 +6,15 @@
             <code-name-base>org.netbeans.modules.php.wordpress</code-name-base>
             <standalone/>
             <module-dependencies>
+                <dependency>
+                    <code-name-base>org.netbeans.api.annotations.common</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <specification-version>1.21.1</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.api.progress</code-name-base>
                     <build-prerequisite/>
@@ -15,6 +24,15 @@
                         <specification-version>1.32.1</specification-version>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.netbeans.libs.json_simple</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <specification-version>0.6.1</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.modules.csl.api</code-name-base>
                     <build-prerequisite/>

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

@@ -48,7 +48,7 @@
 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.CodeCompletionRefreshAction;
+import org.netbeans.modules.php.wordpress.ui.actions.RefreshCodeCompletionAction;
 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.WordPressRunCommandAction;
@@ -86,7 +86,7 @@ public List<? extends Action> getActions() {
         List<Action> actions = new ArrayList<Action>();
         actions.add(CreateThemeAction.getInstance());
         actions.add(CreatePluginAction.getInstance());
-        actions.add(new CodeCompletionRefreshAction());
+        actions.add(new RefreshCodeCompletionAction());
         return actions;
     }
 }

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

@@ -41,7 +41,6 @@
  */
 package org.netbeans.modules.php.wordpress;
 
-import java.awt.Component;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -83,10 +82,12 @@
 import org.netbeans.modules.php.wordpress.util.NetUtils;
 import org.netbeans.modules.php.wordpress.util.WPFileUtils;
 import org.netbeans.modules.php.wordpress.util.WPZipEntryFilter;
+import org.netbeans.modules.php.wordpress.wpapis.WordPressVersionCheckApi;
 import org.openide.filesystems.FileObject;
 import org.openide.filesystems.FileUtil;
 import org.openide.util.Exceptions;
 import org.openide.util.HelpCtx;
+import org.openide.util.NbBundle;
 
 /**
  *
@@ -112,6 +113,7 @@ public class WordPressPhpModuleExtender extends PhpModuleExtender {
     private static final Set<String> CONFIG_KEYS = new HashSet<String>();
     private static final Map<String, String> CONFIG_MAP = new HashMap<String, String>();
     private boolean isInternetReachable = true;
+    private String errorMessage;
     private static final Logger LOGGER = Logger.getLogger(WordPressPhpModuleExtender.class.getName());
 
     static {
@@ -150,31 +152,32 @@ public HelpCtx getHelp() {
         return null;
     }
 
+    @NbBundle.Messages("WordPressPhpModuleExtender.no.installation=There is no available installation method.")
     @Override
     public boolean isValid() {
         String url = panel.getUrlLabel();
         String localFile = panel.getLocalFileLabel();
         if (!isInternetReachable || url.isEmpty()) {
             if (localFile.isEmpty()) {
-                Component[] components = panel.getComponents();
-                for (Component component : components) {
-                    component.setEnabled(false);
-                }
+                // disable all field
+                panel.setAllEnabled(panel, false);
+                panel.setAllEnabled(panel.getWpConfigPanel(), false);
+                errorMessage = Bundle.WordPressPhpModuleExtender_no_installation();
                 return false;
-
             }
         }
+        errorMessage = null;
         return true;
     }
 
     @Override
     public String getErrorMessage() {
-        return null;
+        return errorMessage;
     }
 
     @Override
     public String getWarningMessage() {
-        return null;
+        return errorMessage;
     }
 
     /**
@@ -282,27 +285,31 @@ public Set<FileObject> extend(PhpModule pm) throws ExtendingException {
      */
     private String getDownloadUrl() {
         String downloadUrl = WordPressOptions.getInstance().getDownloadUrl();
-        if (downloadUrl != null && !downloadUrl.isEmpty()) {
+        if (!StringUtils.isEmpty(downloadUrl)) {
             return downloadUrl;
         }
-        Locale locale = Locale.getDefault();
-        String language = locale.getLanguage();
-        String urlPath = WP_DL_URL_DEFAULT;
-        if (language != null && !language.isEmpty()) {
-            if (!language.equals("en")) { // NOI18N
-                urlPath = String.format(WP_DL_URL_FORMAT, language, language);
+
+        // get url from version check api
+        String wpLocale = WordPressOptions.getInstance().getWpLocale();
+        if (StringUtils.isEmpty(wpLocale)) {
+            Locale locale = Locale.getDefault();
+            wpLocale = locale.getLanguage();
+        }
+        if (!StringUtils.isEmpty(wpLocale)) {
+            WordPressVersionCheckApi versionCheckApi = new WordPressVersionCheckApi(wpLocale);
+            try {
+                versionCheckApi.parse();
+                downloadUrl = versionCheckApi.getDownload();
+            } catch (IOException ex) {
+                downloadUrl = WP_DL_URL_DEFAULT;
             }
         }
-        try {
-            URL check = new URL(urlPath);
-            URLConnection connection = check.openConnection();
-            connection.connect();
-        } catch (MalformedURLException ex) {
-            Exceptions.printStackTrace(ex);
-        } catch (IOException ex) {
-            urlPath = WP_DL_URL_DEFAULT;
+        if (!StringUtils.isEmpty(downloadUrl)) {
+            return downloadUrl;
         }
-        return urlPath;
+
+        // default url
+        return WP_DL_URL_DEFAULT;
     }
 
     private void createWpConfig(FileObject sample) {
@@ -379,7 +386,7 @@ private List<String> getSecretKey() {
                 HttpsURLConnection httpsConnection = (HttpsURLConnection) connection;
                 BufferedReader reader = new BufferedReader(new InputStreamReader(httpsConnection.getInputStream(), Charset.UTF8)); // NOI18N
                 try {
-                    String line = null;
+                    String line;
                     while ((line = reader.readLine()) != null) {
                         keys.add(line);
                     }

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

@@ -41,7 +41,9 @@
  */
 package org.netbeans.modules.php.wordpress;
 
+import org.netbeans.modules.php.wordpress.update.WordPressUpgradeChecker;
 import java.io.File;
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
@@ -63,6 +65,7 @@
 import org.openide.filesystems.FileObject;
 import org.openide.filesystems.FileUtil;
 import org.openide.util.ImageUtilities;
+import org.openide.util.Lookup;
 import org.openide.util.NbBundle;
 
 /**
@@ -173,4 +176,16 @@ public PhpModuleCustomizerExtender createPhpModuleCustomizerExtender(PhpModule p
     public EditorExtender getEditorExtender(PhpModule pm) {
         return new WordPressEditorExtender();
     }
+
+    @Override
+    public void phpModuleOpened(PhpModule phpModule) {
+        // check new version
+        Collection<? extends WordPressUpgradeChecker> checkers = Lookup.getDefault().lookupAll(WordPressUpgradeChecker.class);
+        for (WordPressUpgradeChecker checker : checkers) {
+            if (checker.hasUpgrade(phpModule)) {
+                checker.notifyUpgrade(phpModule);
+            }
+        }
+    }
+
 }