Skip to content

Commit cf64114

Browse files
committed
Add the WordPressUnzipException
- Leave a log if a file is not unzipped
1 parent c25a6d2 commit cf64114

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@
5353
import javax.swing.event.DocumentListener;
5454
import javax.swing.text.Document;
5555
import org.netbeans.api.progress.ProgressHandle;
56-
import org.netbeans.api.progress.ProgressHandleFactory;
5756
import org.netbeans.modules.php.api.phpmodule.PhpModule;
5857
import org.netbeans.modules.php.api.util.StringUtils;
5958
import org.netbeans.modules.php.spi.framework.actions.BaseAction;
6059
import org.netbeans.modules.php.wordpress.modules.WordPressModule;
6160
import org.netbeans.modules.php.wordpress.util.GithubZipEntryFilter;
6261
import org.netbeans.modules.php.wordpress.util.WPFileUtils;
6362
import org.netbeans.modules.php.wordpress.util.WPUtils;
63+
import org.netbeans.modules.php.wordpress.util.WordPressUnzipException;
6464
import org.netbeans.modules.php.wordpress.util.ZipEntryFilter;
6565
import org.openide.DialogDisplayer;
6666
import org.openide.NotifyDescriptor;
@@ -187,8 +187,8 @@ public boolean cancel() {
187187
WPFileUtils.unzip(url, themeDirectory, entryFilter);
188188
} catch (MalformedURLException ex) {
189189
Exceptions.printStackTrace(ex);
190-
} catch (IOException ex) {
191-
Exceptions.printStackTrace(ex);
190+
} catch (IOException | WordPressUnzipException ex) {
191+
LOGGER.log(Level.WARNING, null, ex);
192192
} finally {
193193
handle.finish();
194194
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
import java.util.logging.Level;
5252
import java.util.logging.Logger;
5353
import org.netbeans.api.progress.ProgressHandle;
54-
import org.netbeans.api.progress.ProgressHandleFactory;
5554
import org.netbeans.modules.php.api.phpmodule.PhpModule;
5655
import org.netbeans.modules.php.spi.framework.actions.BaseAction;
5756
import org.netbeans.modules.php.wordpress.modules.WordPressModule;
@@ -61,6 +60,7 @@
6160
import org.netbeans.modules.php.wordpress.util.UnderscoresZipEntryFilter;
6261
import org.netbeans.modules.php.wordpress.util.WPFileUtils;
6362
import org.netbeans.modules.php.wordpress.util.WPUtils;
63+
import org.netbeans.modules.php.wordpress.util.WordPressUnzipException;
6464
import org.openide.filesystems.FileAlreadyLockedException;
6565
import org.openide.filesystems.FileObject;
6666
import org.openide.filesystems.FileUtil;
@@ -190,7 +190,7 @@ private boolean unzipAndReplace(FileObject themeFolder) {
190190
themeFolder.refresh();
191191
} catch (MalformedURLException ex) {
192192
LOGGER.log(Level.WARNING, null, ex);
193-
} catch (IOException ex) {
193+
} catch (IOException | WordPressUnzipException ex) {
194194
LOGGER.log(Level.WARNING, null, ex);
195195
}
196196
FileObject[] children = themeFolder.getChildren();

0 commit comments

Comments
 (0)