Improve the zip action #55

Author: junichi11

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

@@ -88,22 +88,41 @@ public ZipAction(DataObject context) {
 
     @Messages({
         "# {0} - file name",
-        "ZipAction.error.file.already.exist=Zip file ({0}) already exists."
+        "ZipAction.error.file.already.exist=Zip file ({0}) already exists.\nDo you really want to overwrite it?",
+        "ZipAction.error.not.directory=It must be selected a directory.",
+        "ZipAction.error.invalid.parent.directory=The parent directory doesn't exist."
     })
     @Override
     public void actionPerformed(ActionEvent ev) {
         if (!isValidDirectory(getFileObject())) {
             return;
         }
 
-        // zip compress
         FileObject target = getFileObject();
+        if (target == null || !target.isFolder()) {
+            showErrorDialog(Bundle.ZipAction_error_not_directory());
+            return;
+        }
+
+        FileObject parent = target.getParent();
+        if (parent == null) {
+            showErrorDialog(Bundle.ZipAction_error_invalid_parent_directory());
+            return;
+        }
+
+        FileObject targetZip = parent.getFileObject(target.getName() + ".zip"); // NOI18N
+        if (targetZip != null) {
+            if (!showConfirmationDialog(Bundle.ZipAction_error_file_already_exist(target.getName() + ".zip"))) { // NOI18N
+                return;
+            }
+        }
+
+        // zip compress
         try {
             WPFileUtils.zip(target);
         } catch (IOException ex) {
             // #36
             LOGGER.log(Level.WARNING, ex.getMessage());
-            showErrorDialog(Bundle.ZipAction_error_file_already_exist(target.getName() + ".zip")); // NOI18N
         }
     }
 
@@ -130,13 +149,6 @@ private boolean isValidDirectory(FileObject target) {
         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;
             }
         }
@@ -153,6 +165,17 @@ private void showErrorDialog(String errorMessage) {
         DialogDisplayer.getDefault().notify(message);
     }
 
+    /**
+     * Show confirmation message dialog.
+     *
+     * @param meesage the confirmation message
+     * @return {@code true} if OK is pressed, otherwise {@code false}
+     */
+    private boolean showConfirmationDialog(String meesage) {
+        NotifyDescriptor.Confirmation message = new NotifyDescriptor.Confirmation(meesage, NotifyDescriptor.OK_CANCEL_OPTION, NotifyDescriptor.QUESTION_MESSAGE);
+        return DialogDisplayer.getDefault().notify(message) == NotifyDescriptor.OK_OPTION;
+    }
+
     @Override
     public Action createContextAwareInstance(Lookup actionContext) {
         DataObject dataObject = actionContext.lookup(DataObject.class);

src/org/netbeans/modules/php/wordpress/util/WPFileUtils.java

@@ -82,8 +82,14 @@ public static void zip(FileObject target) throws IOException {
         }
         // create zip file
         FileObject parent = target.getParent();
-        FileObject zipFile = parent.createData(target.getName() + ".zip"); // NOI18N
-        ZipOutputStream zipOutputStream = new ZipOutputStream(new FileOutputStream(FileUtil.toFile(zipFile)));
+        if (parent == null) {
+            return;
+        }
+        FileObject targetZip = parent.getFileObject(target.getName() + ".zip"); // NOI18N
+        if (targetZip == null) {
+            targetZip = parent.createData(target.getName() + ".zip"); // NOI18N
+        }
+        ZipOutputStream zipOutputStream = new ZipOutputStream(new FileOutputStream(FileUtil.toFile(targetZip)));
 
         // compress
         File targetDirectory = FileUtil.toFile(target);