Fix #7 Validation for existing theme names

Author: junichi11

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

@@ -59,6 +59,7 @@
 import org.netbeans.modules.php.spi.framework.actions.BaseAction;
 import org.netbeans.modules.php.wordpress.util.GithubZipEntryFilter;
 import org.netbeans.modules.php.wordpress.util.WPFileUtils;
+import org.netbeans.modules.php.wordpress.util.WPUtils;
 import org.netbeans.modules.php.wordpress.util.ZipEntryFilter;
 import org.openide.DialogDisplayer;
 import org.openide.NotifyDescriptor;
@@ -106,6 +107,11 @@ protected String getPureName() {
     })
     @Override
     protected void actionPerformed(PhpModule phpModule) {
+        // called via shortcut
+        if (!WPUtils.isWP(phpModule)) {
+            return;
+        }
+
         // get Themes directory
         themesDirectory = WPFileUtils.getThemesDirectory(phpModule);
         if (themesDirectory == null) {

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

@@ -45,7 +45,9 @@
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.net.MalformedURLException;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.netbeans.api.progress.ProgressHandle;
@@ -57,6 +59,7 @@
 import org.netbeans.modules.php.wordpress.util.UnderscoresUtils;
 import org.netbeans.modules.php.wordpress.util.UnderscoresZipEntryFilter;
 import org.netbeans.modules.php.wordpress.util.WPFileUtils;
+import org.netbeans.modules.php.wordpress.util.WPUtils;
 import org.openide.filesystems.FileAlreadyLockedException;
 import org.openide.filesystems.FileObject;
 import org.openide.filesystems.FileUtil;
@@ -105,8 +108,22 @@ protected String getPureName() {
 
     @Override
     protected void actionPerformed(PhpModule pm) {
+        // called via shortcut
+        if (!WPUtils.isWP(pm)) {
+            return;
+        }
+        // create folder
+        FileObject themesDirectory = WPFileUtils.getThemesDirectory(pm);
+        if (themesDirectory == null) {
+            LOGGER.log(Level.WARNING, "themes directory don't exist!");
+            return;
+        }
+
+        // get existing theme names
+        Set<String> existingThemeNames = getExistingThemeNames(themesDirectory);
+
         // create dialog
-        CreateUnderscoresThemePanel panel = new CreateUnderscoresThemePanel();
+        CreateUnderscoresThemePanel panel = new CreateUnderscoresThemePanel(existingThemeNames);
         panel.showDialog();
         if (!panel.isOK()) {
             return;
@@ -124,12 +141,6 @@ protected void actionPerformed(PhpModule pm) {
         _s_ = UnderscoresUtils.toFunctionName(name);
         themeName = name;
 
-        // create folder
-        FileObject themesDirectory = WPFileUtils.getThemesDirectory(pm);
-        if (themesDirectory == null) {
-            LOGGER.log(Level.WARNING, "themes directory don't exist!");
-            return;
-        }
         FileObject themeFolder = null;
         try {
             themeFolder = themesDirectory.createFolder(themeFolerName);
@@ -236,4 +247,20 @@ private void replace(FileObject directory) {
 
         }
     }
+
+    /**
+     * Get existing theme names.
+     *
+     * @param themesDirectory
+     * @return theme names
+     */
+    private Set<String> getExistingThemeNames(FileObject themesDirectory) {
+        Set<String> existingThemeNames = new HashSet<String>();
+        for (FileObject child : themesDirectory.getChildren()) {
+            if (child.isFolder()) {
+                existingThemeNames.add(child.getName());
+            }
+        }
+        return existingThemeNames;
+    }
 }

src/org/netbeans/modules/php/wordpress/ui/wizards/CreateUnderscoresThemePanel.java

@@ -44,6 +44,7 @@
 import java.awt.Dialog;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.util.Set;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 import org.openide.DialogDescriptor;
@@ -61,15 +62,17 @@ public class CreateUnderscoresThemePanel extends javax.swing.JPanel implements A
     private DialogDescriptor descriptor;
     private Dialog dialog;
     private boolean isOK = false;
+    private Set<String> existingThemeNames;
 
     /**
      * Creates new form CreateUnderscoresThemePanel
      */
-    public CreateUnderscoresThemePanel() {
+    public CreateUnderscoresThemePanel(Set<String> existingThemeNames) {
         initComponents();
         descriptor = new DialogDescriptor(this, "Underscores", true, this); // NOI18N
         themeNameTextField.getDocument().addDocumentListener(this);
         descriptor.setValid(false);
+        this.existingThemeNames = existingThemeNames;
     }
 
     public void showDialog() {
@@ -213,6 +216,10 @@ private void doEnablement() {
         } else {
             descriptor.setValid(true);
         }
+        name = name.trim();
+        if (existingThemeNames.contains(name)) {
+            descriptor.setValid(false);
+        }
     }
 
     @Override