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

[jalview.git] / src / jalview / appletgui / AlignFrame.java

diff --git a/src/jalview/appletgui/AlignFrame.java b/src/jalview/appletgui/AlignFrame.java
index 085c9dd..299d1db 100644 (file)
--- a/src/jalview/appletgui/AlignFrame.java
+++ b/src/jalview/appletgui/AlignFrame.java
@@ -83,7 +83,6 @@ import java.awt.event.KeyListener;
 import java.awt.event.WindowAdapter;\r
 import java.awt.event.WindowEvent;\r
 import java.io.IOException;\r
-import java.io.InputStreamReader;\r
 import java.net.URL;\r
 import java.net.URLEncoder;\r
 import java.util.Enumeration;\r
@@ -92,15 +91,6 @@ import java.util.List;
 import java.util.StringTokenizer;\r
 import java.util.Vector;\r
 \r
-import javax.xml.parsers.ParserConfigurationException;\r
-\r
-import org.xml.sax.SAXException;\r
-\r
-import fr.orsay.lri.varna.exceptions.ExceptionFileFormatOrSyntax;\r
-import fr.orsay.lri.varna.exceptions.ExceptionLoadingFailed;\r
-import fr.orsay.lri.varna.exceptions.ExceptionPermissionDenied;\r
-import fr.orsay.lri.varna.exceptions.ExceptionUnmatchedClosingParentheses;\r
-\r
 public class AlignFrame extends EmbmenuFrame implements ActionListener,\r
         ItemListener, KeyListener\r
 {\r
@@ -3720,15 +3710,8 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener,
    *          File/URL/T-COFFEE score file contents\r
    * @throws IOException\r
    * @return true if alignment was annotated with data from source\r
-   * @throws SAXException\r
-   * @throws ParserConfigurationException\r
-   * @throws ExceptionFileFormatOrSyntax\r
-   * @throws ExceptionLoadingFailed\r
-   * @throws ExceptionPermissionDenied\r
-   * @throws InterruptedException\r
-   * @throws ExceptionUnmatchedClosingParentheses\r
    */\r
-  public boolean loadScoreFile(String source) throws Exception\r
+  public boolean loadScoreFile(String source) throws IOException\r
   {\r
 \r
     TCoffeeScoreFile file = new TCoffeeScoreFile(source,\r