document loading refactoring

[debian/openrocket] / core / src / net / sf / openrocket / file / RocketLoader.java

diff --git a/core/src/net/sf/openrocket/file/RocketLoader.java b/core/src/net/sf/openrocket/file/RocketLoader.java
index 4fc8dada7cbd12e37c1ce6c3946e37336778e4a3..6918acd1f2e3be0dd3425bdd7dbfd0aedcfb8de4 100644 (file)
--- a/core/src/net/sf/openrocket/file/RocketLoader.java
+++ b/core/src/net/sf/openrocket/file/RocketLoader.java
@@ -1,74 +1,17 @@
 package net.sf.openrocket.file;
 
-import java.io.BufferedInputStream;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
 import java.io.InputStream;
 
 import net.sf.openrocket.aerodynamics.WarningSet;
 import net.sf.openrocket.document.OpenRocketDocument;
 
-
-public abstract class RocketLoader {
-       protected final WarningSet warnings = new WarningSet();
-       
-       
-       /**
-        * Loads a rocket from the specified File object.
-        */
-       public final OpenRocketDocument load(File source) throws RocketLoadException {
-               warnings.clear();
-               InputStream stream = null;
-               
-               try {
-                       
-                       stream = new BufferedInputStream(new FileInputStream(source));
-                       return load(stream);
-                       
-               } catch (FileNotFoundException e) {
-                       throw new RocketLoadException("File not found: " + source);
-               } finally {
-                       if (stream != null) {
-                               try {
-                                       stream.close();
-                               } catch (IOException e) {
-                                       e.printStackTrace();
-                               }
-                       }
-               }
-       }
+public interface RocketLoader {
        
-       /**
-        * Loads a rocket from the specified InputStream.
-        */
-       public final OpenRocketDocument load(InputStream source) throws RocketLoadException {
-               warnings.clear();
-               
-               try {
-                       return loadFromStream(source);
-               } catch (RocketLoadException e) {
-                       throw e;
-               } catch (IOException e) {
-                       throw new RocketLoadException("I/O error: " + e.getMessage(), e);
-               }
-       }
+       public OpenRocketDocument load(File source) throws RocketLoadException;
        
+       public OpenRocketDocument load(InputStream source) throws RocketLoadException;
        
-
-       /**
-        * This method is called by the default implementations of {@link #load(File)} 
-        * and {@link #load(InputStream)} to load the rocket.
-        * 
-        * @throws RocketLoadException  if an error occurs during loading.
-        */
-       protected abstract OpenRocketDocument loadFromStream(InputStream source) throws IOException,
-                       RocketLoadException;
-       
+       public WarningSet getWarnings();
        
-
-       public final WarningSet getWarnings() {
-               return warnings;
-       }
 }