diff --git a/swing/src/net/sf/openrocket/gui/main/BasicFrame.java b/swing/src/net/sf/openrocket/gui/main/BasicFrame.java index cfdeb14ba..2f968abe1 100644 --- a/swing/src/net/sf/openrocket/gui/main/BasicFrame.java +++ b/swing/src/net/sf/openrocket/gui/main/BasicFrame.java @@ -1284,34 +1284,24 @@ public class BasicFrame extends JFrame { //// Handle the document OpenRocketDocument doc = null; try { - doc = worker.get(); - } catch (ExecutionException e) { - Throwable cause = e.getCause(); - if (cause instanceof FileNotFoundException) { - log.warn("File not found", cause); JOptionPane.showMessageDialog(parent, "File not found: " + displayName, "Error opening file", JOptionPane.ERROR_MESSAGE); return null; - } else if (cause instanceof RocketLoadException) { - log.warn("Error loading the file", cause); JOptionPane.showMessageDialog(parent, "Unable to open file '" + displayName + "': " + cause.getMessage(), "Error opening file", JOptionPane.ERROR_MESSAGE); return null; - } else { - throw new BugException("Unknown error when opening file", e); - } } catch (InterruptedException e) { @@ -1322,7 +1312,6 @@ public class BasicFrame extends JFrame { throw new BugException("Document loader returned null"); } - //// Show warnings WarningSet warnings = worker.getRocketLoader().getWarnings(); if (!warnings.isEmpty()) { diff --git a/swing/src/net/sf/openrocket/gui/main/ExampleDesignFileAction.java b/swing/src/net/sf/openrocket/gui/main/ExampleDesignFileAction.java index b56bc8ddf..b70b47ad8 100644 --- a/swing/src/net/sf/openrocket/gui/main/ExampleDesignFileAction.java +++ b/swing/src/net/sf/openrocket/gui/main/ExampleDesignFileAction.java @@ -107,7 +107,7 @@ public final class ExampleDesignFileAction extends JMenu { /** * When a user clicks on one of the recently used design files, open it. * - * @param file the design file name (absolute path) + * @param example the design file name (absolute path) * * @return the action to open a design file */