From 1fafe0b181ea42766e33c192fb11f22a48140643 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Sat, 24 Dec 2022 04:30:13 +0100 Subject: [PATCH] Generalize error-catching of motor file loading --- .../sf/openrocket/file/motor/ZipFileMotorLoader.java | 2 +- .../sf/openrocket/database/MotorDatabaseLoader.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/src/net/sf/openrocket/file/motor/ZipFileMotorLoader.java b/core/src/net/sf/openrocket/file/motor/ZipFileMotorLoader.java index 176da2dc6..5bed72943 100644 --- a/core/src/net/sf/openrocket/file/motor/ZipFileMotorLoader.java +++ b/core/src/net/sf/openrocket/file/motor/ZipFileMotorLoader.java @@ -44,7 +44,7 @@ public class ZipFileMotorLoader implements MotorLoader { @Override - public List load(InputStream stream, String filename) throws IOException { + public List load(InputStream stream, String filename) throws IOException, IllegalArgumentException { List motors = new ArrayList<>(); ZipInputStream is = new ZipInputStream(stream); diff --git a/swing/src/net/sf/openrocket/database/MotorDatabaseLoader.java b/swing/src/net/sf/openrocket/database/MotorDatabaseLoader.java index b073aee89..c5da0b415 100644 --- a/swing/src/net/sf/openrocket/database/MotorDatabaseLoader.java +++ b/swing/src/net/sf/openrocket/database/MotorDatabaseLoader.java @@ -127,8 +127,8 @@ public class MotorDatabaseLoader extends AsynchronousDatabaseLoader { new Pair( file.getName(), new BufferedInputStream(new FileInputStream(file)))); - } catch (IOException e) { - log.warn("IOException while reading " + file + ": " + e, e); + } catch (Exception e) { + log.warn("Exception while reading " + file + ": " + e, e); } } @@ -158,8 +158,8 @@ public class MotorDatabaseLoader extends AsynchronousDatabaseLoader { dialog.setVisible(true); } f.getV().close(); - } catch (IOException e) { - log.warn("IOException while loading file " + f.getU() + ": " + e, e); + } catch (Exception e) { + log.warn("Exception while loading file " + f.getU() + ": " + e, e); try { f.getV().close(); } catch (IOException e1) { @@ -178,7 +178,7 @@ public class MotorDatabaseLoader extends AsynchronousDatabaseLoader { FileIterator iterator; try { iterator = new DirectoryIterator(file, fileFilter, true); - } catch (IOException e) { + } catch (Exception e) { log.warn("Unable to read directory " + file + ": " + e, e); return; }