fix merge conflicts for finess on JAL-1140 (introduced by 1a8f953dd71a9e319e910261927...

[jalview.git] / src / jalview / io / JPredFile.java

diff --git a/src/jalview/io/JPredFile.java b/src/jalview/io/JPredFile.java
index fc77ad6..abdfed0 100755 (executable)
--- a/src/jalview/io/JPredFile.java
+++ b/src/jalview/io/JPredFile.java
@@ -25,15 +25,6 @@ package jalview.io;
 import java.io.*;
 import java.util.*;
 
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.xml.sax.SAXException;
-
-import fr.orsay.lri.varna.exceptions.ExceptionFileFormatOrSyntax;
-import fr.orsay.lri.varna.exceptions.ExceptionLoadingFailed;
-import fr.orsay.lri.varna.exceptions.ExceptionPermissionDenied;
-import fr.orsay.lri.varna.exceptions.ExceptionUnmatchedClosingParentheses;
-
 import jalview.datamodel.*;
 
 /**
@@ -72,14 +63,16 @@ public class JPredFile extends AlignFile
    *          DOCUMENT ME!
    * @param type
    *          DOCUMENT ME!
- * @throws Exception 
+   * 
+   * @throws IOException
+   *           DOCUMENT ME!
    */
-  public JPredFile(String inFile, String type) throws Exception
+  public JPredFile(String inFile, String type) throws IOException
   {
     super(inFile, type);
   }
 
-  public JPredFile(FileParse source) throws Exception
+  public JPredFile(FileParse source) throws IOException
   {
     super(source);
   }
@@ -354,9 +347,8 @@ public class JPredFile extends AlignFile
    * 
    * @param args
    *          DOCUMENT ME!
- * @throws Exception 
    */
-  public static void main(String[] args) throws Exception
+  public static void main(String[] args) 
   {
     try
     {