Merge branch 'nb80dev'

Author: junichi11

README.md

@@ -1,8 +1,13 @@
-# About
+# NetBeans WordPress Plugin
+
 This is NetBeans plugin for WordPress.
 
+## How to enable
+
+`enabled` option is unchecked as default. Please check it on `project properties > Frameworks > WordPress`
+
 ## Environment
-- NetBeans 7.3+
+- NetBeans 8.0+
 - WordPress 3.5+
 
 ## Features
@@ -20,6 +25,7 @@ This is NetBeans plugin for WordPress.
 - custom content name
 - run command (wp-cli)
 - upgrade notification
+- create a .htaccess file for permalink
 
 ### Impotant Files
 It contains wp-config.php
@@ -125,6 +131,13 @@ Furthermore, we can upgrade(run core update, core update-db, e.t.c.) WordPress w
 
 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
+
+#### Note
+.htaccess file for permalink can be also created with template.
+
 ## Version Number
 
 |       |stable |dev      |

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

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

@@ -48,9 +48,10 @@
 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.RefreshCodeCompletionAction;
+import org.netbeans.modules.php.wordpress.ui.actions.CreatePermalinkHtaccessAction;
 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.RefreshCodeCompletionAction;
 import org.netbeans.modules.php.wordpress.ui.actions.WordPressRunCommandAction;
 import org.netbeans.modules.php.wordpress.ui.options.WordPressOptions;
 import org.openide.util.NbBundle;
@@ -87,6 +88,7 @@ public List<? extends Action> getActions() {
         actions.add(CreateThemeAction.getInstance());
         actions.add(CreatePluginAction.getInstance());
         actions.add(new RefreshCodeCompletionAction());
+        actions.add(CreatePermalinkHtaccessAction.getInstance());
         return actions;
     }
 }

…dules/php/wordpress/WordPressModule.java …hp/wordpress/WordPressModuleInstall.javasrc/org/netbeans/modules/php/wordpress/WordPressModule.java renamed to src/org/netbeans/modules/php/wordpress/WordPressModuleInstall.java src/org/netbeans/modules/php/wordpress/WordPressModule.java renamed to src/org/netbeans/modules/php/wordpress/WordPressModuleInstall.java

@@ -1,4 +1,44 @@
 /*
+ * 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.
@@ -57,9 +97,10 @@
  *
  * @author junichi11
  */
-public class WordPressModule extends ModuleInstall {
+public class WordPressModuleInstall extends ModuleInstall {
 
-    private static final Logger LOGGER = Logger.getLogger(WordPressModule.class.getName());
+    private static final Logger LOGGER = Logger.getLogger(WordPressModuleInstall.class.getName());
+    private static final long serialVersionUID = 6916751777614125653L;
 
     @NbBundle.Messages("WordPressModule.get.commands=Getting wp-cli commands...")
     @Override

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

@@ -41,16 +41,20 @@
  */
 package org.netbeans.modules.php.wordpress;
 
-import org.netbeans.modules.php.wordpress.update.WordPressUpgradeChecker;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.beans.PropertyChangeEvent;
 import java.io.File;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 import org.netbeans.modules.php.api.framework.BadgeIcon;
 import org.netbeans.modules.php.api.phpmodule.PhpModule;
 import org.netbeans.modules.php.api.phpmodule.PhpModuleProperties;
+import org.netbeans.modules.php.api.validation.ValidationResult;
 import org.netbeans.modules.php.spi.editor.EditorExtender;
 import org.netbeans.modules.php.spi.framework.PhpFrameworkProvider;
 import org.netbeans.modules.php.spi.framework.PhpModuleActionsExtender;
@@ -61,23 +65,30 @@
 import org.netbeans.modules.php.wordpress.commands.WordPressCommandSupport;
 import org.netbeans.modules.php.wordpress.customizer.WordPressCustomizerExtender;
 import org.netbeans.modules.php.wordpress.editor.WordPressEditorExtender;
+import org.netbeans.modules.php.wordpress.modules.WordPressModule;
 import org.netbeans.modules.php.wordpress.preferences.WordPressPreferences;
+import org.netbeans.modules.php.wordpress.update.WordPressUpgradeChecker;
+import org.netbeans.modules.php.wordpress.validators.WordPressModuleValidator;
+import org.openide.awt.Notification;
+import org.openide.awt.NotificationDisplayer;
 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;
+import org.openide.util.RequestProcessor;
 
 /**
  *
  * @author junichi11
  */
 public class WordPressPhpProvider extends PhpFrameworkProvider {
 
+    private static final RequestProcessor RP = new RequestProcessor(WordPressPhpProvider.class);
     private static final WordPressPhpProvider INSTANCE = new WordPressPhpProvider();
     private static final String ICON_PATH = "org/netbeans/modules/php/wordpress/resources/wordpress_badge_8.png"; // NOI18N
     private final BadgeIcon badgeIcon;
-    private static final Set<String> WP_DIRS = new HashSet<String>();
+    public static final Set<String> WP_DIRS = new HashSet<String>();
 
     static {
         WP_DIRS.add("wp-admin"); // NOI18N
@@ -108,30 +119,16 @@ private WordPressPhpProvider() {
 
     @Override
     public boolean isInPhpModule(PhpModule pm) {
-        FileObject sourceDirectory = pm.getSourceDirectory();
-        if (sourceDirectory != null) {
-            for (String dir : WP_DIRS) {
-                FileObject fileObject = sourceDirectory.getFileObject(dir);
-                if (fileObject == null) {
-                    return false;
-                }
-            }
-
-            // content name
-            FileObject content = sourceDirectory.getFileObject(WordPressPreferences.getCustomContentName(pm));
-            if (content == null) {
-                return false;
-            }
-        }
-        return true;
+        return WordPressPreferences.isEnabled(pm);
     }
 
     @Override
     public File[] getConfigurationFiles(PhpModule pm) {
         List<File> files = new LinkedList<File>();
-        FileObject sourceDirectory = pm.getSourceDirectory();
-        if (sourceDirectory != null) {
-            FileObject config = sourceDirectory.getFileObject("wp-config.php"); // NOI18N
+        WordPressModule wpModuel = WordPressModule.Factory.forPhpModule(pm);
+        FileObject wordPressRoot = wpModuel.getWordPressRootDirecotry();
+        if (wordPressRoot != null) {
+            FileObject config = wordPressRoot.getFileObject("wp-config.php"); // NOI18N
             if (config != null) {
                 files.add(FileUtil.toFile(config));
             }
@@ -177,13 +174,81 @@ public EditorExtender getEditorExtender(PhpModule pm) {
         return new WordPressEditorExtender();
     }
 
+    @Override
+    public void phpModuleClosed(PhpModule phpModule) {
+        WordPressModule.Factory.remove(phpModule);
+    }
+
+    @NbBundle.Messages({
+        "# {0} - name",
+        "WordPressPhpProvider.autoditection=WordPress autoditection : {0}",
+        "WordPressPhpProvider.autoditection.action=If you want to enable as WordPress project, please click here."
+    })
     @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);
+        // this method is run for not only WordPress projects but also all php projects,
+        // so need check i.e. avoid NPE
+        if (isInPhpModule(phpModule)) {
+            // check new version
+            Collection<? extends WordPressUpgradeChecker> checkers = Lookup.getDefault().lookupAll(WordPressUpgradeChecker.class);
+            for (WordPressUpgradeChecker checker : checkers) {
+                if (checker.hasUpgrade(phpModule)) {
+                    checker.notifyUpgrade(phpModule);
+                }
+            }
+        }
+        RP.schedule(new WordPressAutoDetectionTask(phpModule), 1, TimeUnit.MINUTES);
+    }
+
+    //~ Inner class
+    private static class WordPressAutoDetectionTask implements Runnable {
+
+        private final PhpModule phpModule;
+        private Notification notification;
+
+        public WordPressAutoDetectionTask(PhpModule phpModule) {
+            this.phpModule = phpModule;
+        }
+
+        @Override
+        public void run() {
+            // auto detection
+            FileObject wordPressRoot = phpModule.getSourceDirectory();
+            if (wordPressRoot == null) {
+                return;
+            }
+            ValidationResult result = new WordPressModuleValidator()
+                    .validateWordPressDirectories(wordPressRoot, WordPressPreferences.getCustomContentName(phpModule))
+                    .getResult();
+            if (result.hasWarnings()) {
+                return;
+            }
+
+            // show notification displayer
+            if (!WordPressPreferences.isEnabled(phpModule)) {
+                NotificationDisplayer notificationDisplayer = NotificationDisplayer.getDefault();
+                notification = notificationDisplayer.notify(
+                        Bundle.WordPressPhpProvider_autoditection(phpModule.getDisplayName()), // title
+                        NotificationDisplayer.Priority.LOW.getIcon(), // icon
+                        Bundle.WordPressPhpProvider_autoditection_action(),
+                        new WordPressAutoDetectionActionListener(), // action
+                        NotificationDisplayer.Priority.LOW); // priority
+            }
+
+        }
+
+        private class WordPressAutoDetectionActionListener implements ActionListener {
+
+            public WordPressAutoDetectionActionListener() {
+            }
+
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                WordPressPreferences.setEnabled(phpModule, true);
+                WordPressModule module = WordPressModule.Factory.forPhpModule(phpModule);
+                module.notifyPropertyChanged(new PropertyChangeEvent(this, WordPressModule.PROPERTY_CHANGE_WP, null, null));
+                phpModule.notifyPropertyChanged(new PropertyChangeEvent(this, PhpModule.PROPERTY_FRAMEWORKS, null, null));
+                notification.clear();
             }
         }
     }

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

@@ -45,8 +45,8 @@
 import java.util.HashMap;
 import java.util.Map;
 import org.netbeans.modules.php.api.phpmodule.PhpModule;
+import org.netbeans.modules.php.wordpress.modules.WordPressModule;
 import org.netbeans.modules.php.wordpress.ui.status.DebugStatusLineElement;
-import org.netbeans.modules.php.wordpress.util.WPFileUtils;
 import org.netbeans.modules.php.wordpress.util.WPUtils;
 import org.openide.awt.StatusLineElementProvider;
 import org.openide.filesystems.FileChangeAdapter;
@@ -74,7 +74,8 @@ public static WordPressVersion create(PhpModule phpModule) {
             return version;
         }
 
-        FileObject versionFile = WPFileUtils.getVersionFile(phpModule);
+        WordPressModule wpModule = WordPressModule.Factory.forPhpModule(phpModule);
+        FileObject versionFile = wpModule.getVersionFile();
         if (versionFile == null) {
             return null;
         }

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

@@ -65,6 +65,7 @@
 import org.netbeans.modules.php.api.phpmodule.PhpModule;
 import org.netbeans.modules.php.api.util.StringUtils;
 import org.netbeans.modules.php.spi.framework.commands.FrameworkCommand;
+import org.netbeans.modules.php.wordpress.modules.WordPressModule;
 import org.netbeans.modules.php.wordpress.ui.options.WordPressOptions;
 import org.openide.DialogDisplayer;
 import org.openide.NotifyDescriptor;
@@ -258,8 +259,14 @@ public List<String> getThemeStatus(PhpModule phpModule) {
      */
     private List<String> getStatus(String command, PhpModule phpModule) {
         HelpLineProcessor lineProcessor = new HelpLineProcessor();
+        WordPressModule wpModule = WordPressModule.Factory.forPhpModule(phpModule);
+        FileObject root = wpModule.getWordPressRootDirecotry();
+        if (root == null) {
+            lineProcessor.asLines();
+        }
+
         Future<Integer> result = createExecutable()
-                .workDir(FileUtil.toFile(phpModule.getSourceDirectory()))
+                .workDir(FileUtil.toFile(root))
                 .additionalParameters(Arrays.asList(command, STATUS_COMMAND))
                 .run(getSilentDescriptor(), getOutputProcessorFactory(lineProcessor));
         try {
@@ -466,12 +473,13 @@ public Future<Integer> runCommand(PhpModule phpModule, List<String> parameters)
      * @return PhpExecutable
      */
     private PhpExecutable getExecutable(PhpModule phpModule) {
-        FileObject sourceDirectory = phpModule.getSourceDirectory();
-        if (sourceDirectory == null) {
+        WordPressModule wpModule = WordPressModule.Factory.forPhpModule(phpModule);
+        FileObject wordPressRootDirectory = wpModule.getWordPressRootDirecotry();
+        if (wordPressRootDirectory == null) {
             return null;
         }
         return createExecutable()
-                .workDir(FileUtil.toFile(sourceDirectory));
+                .workDir(FileUtil.toFile(wordPressRootDirectory));
     }
 
     /**

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

@@ -1,4 +1,14 @@
 WordPressCustomizerExtenderPanel.customContentNameLabel.text=custom content name:
-WordPressCustomizerExtenderPanel.customContentNameLabel.text=custom content name:
+WordPressCustomizerExtenderPanel.customContentNameLabel.text=Custom content name:
 WordPressCustomizerExtenderPanel.customContentNameTextField.text=
 WordPressCustomizerExtenderPanel.customContentNameTextField.text=
+WordPressCustomizerExtenderPanel.toolTipText=Please check this if you want to enable as WordPress project
+WordPressCustomizerExtenderPanel.enabledCheckBox.text=Enabled
+WordPressCustomizerExtenderPanel.customDirectoryPathLabel.text=Custom directory paths from source directory:
+WordPressCustomizerExtenderPanel.pluginsLabel.text=plugins:
+WordPressCustomizerExtenderPanel.pluginsTextField.text=
+WordPressCustomizerExtenderPanel.themesLabel.text=themes:
+WordPressCustomizerExtenderPanel.wordPressRootLabel.text=WordPress Root:
+WordPressCustomizerExtenderPanel.wordPressRootTextField.text=
+WordPressCustomizerExtenderPanel.themesTextField.text=
+WordPressCustomizerExtenderPanel.customDirectoryPathLabel.toolTipText=empty is default directory structure