Merge branch 'nb80dev'

Author: junichi11

README.md

@@ -84,12 +84,6 @@ WordPress version number is also displayed.
 ### Create New Theme Action
 Right-click Project > WordPress > Create Theme
 
-### Create New Child Theme Action
-Right-click Project > WordPress > Create Child Theme
-
-- Create a new directory for child theme
-- Add style.css for child theme
-
 #### Underscores
 Create 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).
@@ -99,6 +93,12 @@ This plugin uses [Automattic/_s · GitHub](https://github.com/automattic/_s).
 #### Barebones
 Create theme form [welcomebrand/Barebones · GitHub](https://github.com/welcomebrand/Barebones).
 
+### Create New Child Theme Action
+Right-click Project > 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
 

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

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

@@ -44,15 +44,18 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import org.netbeans.modules.php.wordpress.WordPress;
 import org.netbeans.modules.php.wordpress.util.WPFileUtils;
+import org.openide.DialogDisplayer;
+import org.openide.NotifyDescriptor;
 import org.openide.awt.ActionID;
 import org.openide.awt.ActionReference;
 import org.openide.awt.ActionReferences;
 import org.openide.awt.ActionRegistration;
 import org.openide.filesystems.FileObject;
 import org.openide.loaders.DataObject;
-import org.openide.util.Exceptions;
 import org.openide.util.NbBundle.Messages;
 
 @ActionID(
@@ -69,11 +72,16 @@
 public final class ZipAction implements ActionListener {
 
     private final DataObject context;
+    private static final Logger LOGGER = Logger.getLogger(ZipAction.class.getName());
 
     public ZipAction(DataObject context) {
         this.context = context;
     }
 
+    @Messages({
+        "# {0} - file name",
+        "ZipAction.error.file.already.exist=Zip file ({0}) already exists."
+    })
     @Override
     public void actionPerformed(ActionEvent ev) {
         if (!isValidDirectory()) {
@@ -85,7 +93,9 @@ public void actionPerformed(ActionEvent ev) {
         try {
             WPFileUtils.zip(target);
         } catch (IOException ex) {
-            Exceptions.printStackTrace(ex);
+            // #36
+            LOGGER.log(Level.WARNING, ex.getMessage());
+            showErrorDialog(Bundle.ZipAction_error_file_already_exist(target.getName() + ".zip")); // NOI18N
         }
     }
 
@@ -110,9 +120,26 @@ private boolean isValidDirectory() {
         String name = parent.getNameExt();
         if (parent.isFolder()) {
             if (name.equals("plugins") || name.equals("themes")) { // NOI18N
+                // #36
+                String zipFileName = target.getName() + ".zip"; // NOI18N
+                FileObject zipFile = parent.getFileObject(zipFileName);
+                if (zipFile != null) {
+                    showErrorDialog(Bundle.ZipAction_error_file_already_exist(zipFileName));
+                    return false;
+                }
                 return true;
             }
         }
         return false;
     }
+
+    /**
+     * Show error message dialog.
+     *
+     * @param errorMessage Error message
+     */
+    private void showErrorDialog(String errorMessage) {
+        NotifyDescriptor.Message message = new NotifyDescriptor.Message(errorMessage, NotifyDescriptor.ERROR_MESSAGE);
+        DialogDisplayer.getDefault().notify(message);
+    }
 }

src/org/netbeans/modules/php/wordpress/ui/status/DebugStatusLineElement.java

@@ -66,6 +66,7 @@
 import javax.swing.Popup;
 import javax.swing.PopupFactory;
 import javax.swing.SwingConstants;
+import javax.swing.SwingUtilities;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import javax.swing.text.BadLocationException;
@@ -301,31 +302,49 @@ public String getDebugLevel(FileObject config) {
      *
      * @param debugLv true or false
      */
-    private void setDebugLevelLabel(String debugLv) {
-        if (debugLv.matches("^(true|false)$")) { // NOI18N
-            debugLabel.setText(debugLevel.get(debugLv));
-        } else {
-            debugLabel.setText(debugLv);
-        }
+    private void setDebugLevelLabel(final String debugLv) {
+        SwingUtilities.invokeLater(new Runnable() {
+
+            @Override
+            public void run() {
+                if (debugLv.matches("^(true|false)$")) { // NOI18N
+                    debugLabel.setText(debugLevel.get(debugLv));
+                } else {
+                    debugLabel.setText(debugLv);
+                }
+            }
+        });
     }
 
     /**
      * Set version versionLv.
      *
      * @param versionNumber
      */
-    private void setVersionLabel(String versionNumber) {
-        versionLabel.setText(versionNumber);
-        versionLabel.setIcon(icon);
+    private void setVersionLabel(final String versionNumber) {
+        SwingUtilities.invokeLater(new Runnable() {
+
+            @Override
+            public void run() {
+                versionLabel.setText(versionNumber);
+                versionLabel.setIcon(icon);
+            }
+        });
     }
 
     /**
      * Clear debug label
      */
     private void clearLabel() {
-        debugLabel.setText(""); //NOI18N
-        versionLabel.setText(""); // NOI18N
-        versionLabel.setIcon(null);
+        SwingUtilities.invokeLater(new Runnable() {
+
+            @Override
+            public void run() {
+                debugLabel.setText(""); //NOI18N
+                versionLabel.setText(""); // NOI18N
+                versionLabel.setIcon(null);
+            }
+        });
     }
 
     public void setLevel(String level) {

src/org/netbeans/modules/php/wordpress/wpapis/WordPressVersionCheckApi.java

@@ -88,6 +88,10 @@ public void parse() throws IOException {
         InputStream inputStream = openStream();
         try {
             JSONObject jsonObject = (JSONObject) JSONValue.parse(new InputStreamReader(inputStream, Charset.UTF8));
+            if (jsonObject == null) {
+                LOGGER.log(Level.INFO, "Can't get json for version check information."); // NOI18N
+                return;
+            }
             JSONArray offers = (JSONArray) jsonObject.get("offers"); // NOI18N
 
             // get version and locale