Merge branch 'nb82dev'

Author: junichi11

README.md

@@ -4,13 +4,15 @@ This is NetBeans plugin for WordPress.
 
 ## How to enable
 
-`enabled` option is unchecked as default. Please check it on `project properties > Frameworks > WordPress`
+`enabled` option is unchecked by default. Please check it on `project properties > Frameworks > WordPress`
 
-## Environment
-- NetBeans 8.0+
+## Requirements
+
+- NetBeans 8.2+
 - WordPress 3.5+
 
 ## Features
+
 - badge icon
 - important files
 - create new WordPress project
@@ -34,38 +36,47 @@ This is NetBeans plugin for WordPress.
 - .htaccess (only the root directory)
 
 ### Create New WordPress Project
-You can create a new WordPress project with Wizard.
-
-1. set Tools > Options > PHP > WordPress > download url(e.g. http://wordpress.org/latest.zip) or local file path(e.g. /path/to/wordpress.zip)
-2. check New Project > PHP > PHP Application > ... > Framework > WordPress PHP Web Blog/CMS
-3. select options (url / local file / wp-cli)
-4. finish
 
-### Custome Content Name
+You can create a new WordPress project via a wizard.
 
-If you want to use custom content name(default is `wp-content`), please set your content name to the project properties.
-(project properties > Framework > WordPress)
+1. Set Tools > Options > PHP > WordPress > download url(e.g. http://wordpress.org/latest.zip) or local file path(e.g. /path/to/wordpress.zip)
+2. Click File > New Project
+3. Check PHP > PHP Application > ... > Framework > WordPress PHP Web Blog/CMS
+4. Select options (url / local file / wp-cli)
+5. Set wp-config options
+6. Click the Finish button
 
 #### options
-- Set format to project : set format option to project.properties
-- create wp-config.php : copy from wp-config-sample.php
+
+- Set format options for WordPress to this project : add format options for WordPress to project.properties
+- Create a wp-config.php : copy from wp-config-sample.php
+
+### Custom Content Name
+
+If you want to use a custom content name (default value is `wp-content`), please set your content name to the project properties.
+(project properties > Framework > WordPress)
+If your wp-content directory is not in your WordPress Root, please set a relative path (from a source directory to wp-content directory) to `wp-content`.
 
 ### Code Templates
+
 - wpph : wordpress plugin header
 - wpgpl : wordpress license comment
 
 e.g. please type wpph [Tab]
 
 ### Zip Compress Action
+
 You can compress specified pluign or theme directory as Zip file to the same hierarchy.  
 Right-click active plugin or theme node > Zip compress
 
 ### Template Files
+
 You can create a pluign file and readme file with new file wizard.
 
-Right-click directory > New > Others > WordPress > (WordPress Plugin | WordPress Plugin Readme)
+Right-click a directory > New > Others > WordPress > (WordPress Plugin | WordPress Plugin Readme)
 
 ### Code Completion for Filter and Action
+
 This feature is available the followings:
 - add_filter, remove_filter
 - add_acttion, remove_action
@@ -79,43 +90,50 @@ 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 bottom-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
+
+Right-click a WordPress project node > WordPress > Create Theme
 
 #### Minimum Theme
 
-Just create a style.css and an empty index.php.
+Just create a style.css and an empty index.php to the directory which you named.
 
 #### Underscores
-Create theme from [Underscores | A Starter Theme for WordPress](http://underscores.me/). Underscores is awesome!
+
+Create a theme from [Underscores | A Starter Theme for WordPress](http://underscores.me/). Underscores is awesome!
 This plugin uses [Automattic/_s · GitHub](https://github.com/automattic/_s).
 
 **Please note that license of created theme is GPLv2**
 
 #### Barebones
-Create theme form [welcomebrand/Barebones · GitHub](https://github.com/welcomebrand/Barebones).
+
+Create a theme form [welcomebrand/Barebones · GitHub](https://github.com/welcomebrand/Barebones).
 
 ### Create New Child Theme Action
-Right-click Project > WordPress > Create Child Theme
+
+Right-click a WordPress project node > WordPress > Create Child Theme
 
 - Create a new directory for child theme
 - Add style.css for child theme
 
 ### Create New Plugin Action
+
 Right-click Project > WordPress > Create Plugin
 
-This is very simple feature.
-- input plugin name(plugin_name)
-- create new plugin directory(plugins/plugin_name)
-- add main plugin file (plugins/plugin_name/plugin_name.php)
-- add readme file (plugins/plugin_name/readme.txt)
+This is very simple feature. If you input a plugin name (plugin_name)...
+
+- Create a new plugin directory (plugins/plugin_name)
+- Add a main plugin file there (plugins/plugin_name/plugin_name.php)
+- Add a readme file there (plugins/plugin_name/readme.txt)
 
 ### Hyperlink Navigation
-This feature is available the followings:
+
+This feature is available on the parameters of following functions:
 - add_filter, remove_filter
 - add_action, remove_action
 
@@ -124,31 +142,31 @@ Then caret position go to function. (first parameter is available when there are
 
 ### Run Command
 
-We can run wp-cli commands. *Please notice that this action needs so much time to get command list at first time.*
+You can run wp-cli commands. *Please note that this action needs so much time to get command list at first time.*
 
 1. Set wp-cli script path to Options. Tools > Options > PHP > WordPress
-2. Select WordPress Project node
-3. Right-click > WordPress > RunCommand...
+2. Right-click a WordPress project node > WordPress > RunCommand...
 
 #### wp-cli
 
-Please see the followings:
+Please see the following links:
 
 - 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.
+Check whether new versions (for core, plugin and theme) are available when a WordPress project is opened.
+Furthermore, you can upgrade(run core update, core update-db, e.t.c.) WordPress from a 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.
 
 ### Create a .htaccess file for permalink
 
-Right-click project node > WordPress > Create .htaccesss for permalink
+Right-click a WordPress project node > WordPress > Create .htaccesss for permalink
 
 #### Note
+
 .htaccess file for permalink can be also created with template.
 
 ## Version Number
@@ -166,9 +184,10 @@ Available on [Plugin Portal](http://plugins.netbeans.org/plugin/46542/php-wordpr
 
 If development version exists, it will be available in the same archive as stable version.
 
-### Archive
+### Downloads
 
 [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.9.2
+OpenIDE-Module-Specification-Version: 0.9.3
 OpenIDE-Module-Install: org/netbeans/modules/php/wordpress/WordPressModuleInstall.class

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

@@ -161,7 +161,6 @@ public boolean isValid() {
             if (localFile.isEmpty()) {
                 // disable all field
                 panel.setAllEnabled(panel, false);
-                panel.setAllEnabled(panel.getWpConfigPanel(), false);
                 errorMessage = Bundle.WordPressPhpModuleExtender_no_installation();
                 return false;
             }
@@ -193,7 +192,6 @@ public String getWarningMessage() {
     @Override
     public Set<FileObject> extend(PhpModule pm) throws ExtendingException {
         panel.setAllEnabled(panel, false);
-        panel.setAllEnabled(panel.getWpConfigPanel(), false);
 
         FileObject sourceDirectory = pm.getSourceDirectory();
         if (panel.useUrl()) {

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

@@ -205,7 +205,7 @@ public void run() {
                 return;
             }
             ValidationResult result = new WordPressModuleValidator()
-                    .validateWordPressDirectories(wordPressRoot, WordPressPreferences.getCustomContentName(phpModule))
+                    .validateWordPressDirectories(wordPressRoot, WordPressPreferences.getCustomContentName(phpModule), null)
                     .getResult();
             if (result.hasWarnings()) {
                 return;

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

@@ -12,3 +12,6 @@ WordPressCustomizerExtenderPanel.wordPressRootLabel.text=WordPress Root:
 WordPressCustomizerExtenderPanel.wordPressRootTextField.text=
 WordPressCustomizerExtenderPanel.themesTextField.text=
 WordPressCustomizerExtenderPanel.customDirectoryPathLabel.toolTipText=empty is default directory structure
+WordPressCustomizerExtenderPanel.wpContentLabel.text=wp-content:
+WordPressCustomizerExtenderPanel.wpContentTextField.text=
+WordPressCustomizerExtenderPanel.jLabel1.text=(If wp-content is not in the WordPress Root)

src/org/netbeans/modules/php/wordpress/customizer/WordPressCustomizerExtender.java

@@ -69,9 +69,11 @@ public class WordPressCustomizerExtender extends PhpModuleCustomizerExtender {
     private boolean isValid;
     private String originalCustomeContentName;
     private String errorMessage;
+    // paths
     private String originalWordPressRoot;
     private String originalPlugins;
     private String originalThemes;
+    private String originalWpContent;
 
     public WordPressCustomizerExtender(PhpModule phpModule) {
         this.phpModule = phpModule;
@@ -125,20 +127,25 @@ private void validate() {
         String contentName = getPanel().getCustomContentName();
         FileObject sourceDirectory = phpModule.getSourceDirectory();
         FileObject wordPressRoot = null;
+        FileObject wpContentDirectory = null;
         if (sourceDirectory != null) {
             wordPressRoot = sourceDirectory.getFileObject(wordPressRootDirectoryPath);
+            if (!getPanel().getWpContentDirectory().isEmpty()) {
+                wpContentDirectory = sourceDirectory.getFileObject(getPanel().getWpContentDirectory());
+            }
         }
 
         ValidationResult result = new WordPressCustomizerValidator()
-                .validateWpContent(phpModule, wordPressRoot, contentName)
+                .validateWpContent(phpModule, wordPressRoot, contentName, wpContentDirectory)
                 .validateWordPressRootDirectory(phpModule, getPanel().getWordPressRootDirectory())
                 .validatePluginsDirectory(phpModule, getPanel().getPluginsDirectory())
                 .validateThemesDirectory(phpModule, getPanel().getThemesDirectory())
+                .validateWpContentDirectory(phpModule, getPanel().getWpContentDirectory())
                 .getResult();
 
         if (wordPressRoot != null) {
             ValidationResult wpResult = new WordPressModuleValidator()
-                    .validateWordPressDirectories(wordPressRoot, contentName)
+                    .validateWordPressDirectories(wordPressRoot, contentName, wpContentDirectory)
                     .getResult();
             result.merge(wpResult);
         }
@@ -175,20 +182,25 @@ public EnumSet<Change> save(PhpModule pm) {
         }
 
         String wordPressRoot = getPanel().getWordPressRootDirectory();
-        if (!originalCustomeContentName.equals(wordPressRoot)) {
+        if (!originalWordPressRoot.equals(wordPressRoot)) {
             WordPressPreferences.setWordPressRootPath(phpModule, wordPressRoot);
         }
 
         String plugins = getPanel().getPluginsDirectory();
-        if (!originalCustomeContentName.equals(plugins)) {
+        if (!originalPlugins.equals(plugins)) {
             WordPressPreferences.setPluginsPath(phpModule, plugins);
         }
 
         String themes = getPanel().getThemesDirectory();
-        if (!originalCustomeContentName.equals(themes)) {
+        if (!originalThemes.equals(themes)) {
             WordPressPreferences.setThemesPath(phpModule, themes);
         }
 
+        String wpContent = getPanel().getWpContentDirectory();
+        if (!originalWpContent.equals(wpContent)) {
+            WordPressPreferences.setWpContentPath(phpModule, wpContent);
+        }
+
         WordPressModule wpModule = WordPressModule.Factory.forPhpModule(phpModule);
         wpModule.notifyPropertyChanged(new PropertyChangeEvent(this, WordPressModule.PROPERTY_CHANGE_WP, null, null));
         return EnumSet.of(Change.FRAMEWORK_CHANGE);
@@ -202,12 +214,14 @@ private WordPressCustomizerExtenderPanel getPanel() {
             originalWordPressRoot = WordPressPreferences.getWordPressRootPath(phpModule);
             originalPlugins = WordPressPreferences.getPluginsPath(phpModule);
             originalThemes = WordPressPreferences.getThemesPath(phpModule);
+            originalWpContent = WordPressPreferences.getWpContentPath(phpModule);
             panel.setPluginEnabled(originalEnabled);
             panel.setCustomContentName(originalCustomeContentName);
             panel.setComponentsEnabled(originalEnabled);
             panel.setWordPressRootDirectory(originalWordPressRoot);
             panel.setPluginsDirectory(originalPlugins);
             panel.setThemesDirectory(originalThemes);
+            panel.setWpContentDirectory(originalWpContent);
         }
 
         return panel;

src/org/netbeans/modules/php/wordpress/customizer/WordPressCustomizerExtenderPanel.form

@@ -42,12 +42,18 @@
                           <Component id="wordPressRootLabel" alignment="0" min="-2" max="-2" attributes="0"/>
                           <Component id="pluginsLabel" alignment="0" min="-2" max="-2" attributes="0"/>
                           <Component id="themesLabel" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Component id="wpContentLabel" alignment="0" min="-2" max="-2" attributes="0"/>
                       </Group>
                       <EmptySpace max="-2" attributes="0"/>
                       <Group type="103" groupAlignment="0" attributes="0">
+                          <Group type="102" attributes="0">
+                              <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
+                              <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                          </Group>
                           <Component id="wordPressRootTextField" max="32767" attributes="0"/>
                           <Component id="pluginsTextField" max="32767" attributes="0"/>
                           <Component id="themesTextField" alignment="0" max="32767" attributes="0"/>
+                          <Component id="wpContentTextField" alignment="0" max="32767" attributes="0"/>
                       </Group>
                   </Group>
               </Group>
@@ -82,6 +88,13 @@
                   <Component id="themesLabel" alignment="3" min="-2" max="-2" attributes="0"/>
                   <Component id="themesTextField" alignment="3" min="-2" max="-2" attributes="0"/>
               </Group>
+              <EmptySpace max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="3" attributes="0">
+                  <Component id="wpContentLabel" alignment="3" min="-2" max="-2" attributes="0"/>
+                  <Component id="wpContentTextField" alignment="3" min="-2" max="-2" attributes="0"/>
+              </Group>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="32767" attributes="0"/>
           </Group>
       </Group>
@@ -164,5 +177,26 @@
         </Property>
       </Properties>
     </Component>
+    <Component class="javax.swing.JLabel" name="wpContentLabel">
+      <Properties>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/netbeans/modules/php/wordpress/customizer/Bundle.properties" key="WordPressCustomizerExtenderPanel.wpContentLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JTextField" name="wpContentTextField">
+      <Properties>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/netbeans/modules/php/wordpress/customizer/Bundle.properties" key="WordPressCustomizerExtenderPanel.wpContentTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JLabel" name="jLabel1">
+      <Properties>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/netbeans/modules/php/wordpress/customizer/Bundle.properties" key="WordPressCustomizerExtenderPanel.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+    </Component>
   </SubComponents>
 </Form>