X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FAlignFile.java;h=f73e250528d0f7771225137b261b6574ee8e810c;hb=d518f19c8d411d365085962d4ec8dadc78e773f9;hp=1d6b76b1a172ee900970de378d0077660653f44e;hpb=28787d9646cca5dd77190930f59b7ff32cf995b4;p=jalview.git

diff --git a/src/jalview/io/AlignFile.java b/src/jalview/io/AlignFile.java
index 1d6b76b..f73e250 100755
--- a/src/jalview/io/AlignFile.java
+++ b/src/jalview/io/AlignFile.java
@@ -1,19 +1,22 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * Copyright (C) 2014 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
  * Jalview is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
  *  
  * Jalview is distributed in the hope that it will be useful, but 
  * WITHOUT ANY WARRANTY; without even the implied warranty 
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
  * PURPOSE.  See the GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.io;
 
@@ -21,21 +24,13 @@ import jalview.datamodel.Alignment;
 import jalview.datamodel.AlignmentAnnotation;
 import jalview.datamodel.Sequence;
 import jalview.datamodel.SequenceI;
+import jalview.util.MessageManager;
 
 import java.io.IOException;
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Vector;
 
-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;
-
 /**
  * DOCUMENT ME!
  * 
@@ -74,8 +69,10 @@ public abstract class AlignFile extends FileParse
    */
   public AlignFile()
   {
-	  // Shouldn't we init data structures
-	  initData();
+    // Shouldn't we init data structures (JBPNote: not sure - initData is for
+    // initialising the structures used for reading from a datasource, and the
+    // bare constructor hasn't got any datasource)
+    initData();
   }
 
   /**
@@ -85,15 +82,8 @@ public abstract class AlignFile extends FileParse
    *          Filename to read from.
    * @param type
    *          What type of file to read from (File, URL)
- * @throws SAXException 
- * @throws ParserConfigurationException 
- * @throws ExceptionFileFormatOrSyntax 
- * @throws ExceptionLoadingFailed 
- * @throws ExceptionPermissionDenied 
- * @throws InterruptedException 
- * @throws ExceptionUnmatchedClosingParentheses 
    */
-  public AlignFile(String inFile, String type) throws IOException, ExceptionFileFormatOrSyntax, ParserConfigurationException, SAXException, ExceptionPermissionDenied, ExceptionLoadingFailed, InterruptedException, ExceptionUnmatchedClosingParentheses
+  public AlignFile(String inFile, String type) throws IOException
   {
     super(inFile, type);
     initData();
@@ -111,15 +101,8 @@ public abstract class AlignFile extends FileParse
    * 
    * @param source
    * @throws IOException
- * @throws SAXException 
- * @throws ParserConfigurationException 
- * @throws ExceptionFileFormatOrSyntax 
- * @throws ExceptionLoadingFailed 
- * @throws ExceptionPermissionDenied 
- * @throws InterruptedException 
- * @throws ExceptionUnmatchedClosingParentheses 
    */
-  public AlignFile(FileParse source) throws IOException, ExceptionFileFormatOrSyntax, ParserConfigurationException, SAXException, ExceptionPermissionDenied, ExceptionLoadingFailed, InterruptedException, ExceptionUnmatchedClosingParentheses
+  public AlignFile(FileParse source) throws IOException
   {
     super(source);
     initData();
@@ -214,8 +197,7 @@ public abstract class AlignFile extends FileParse
   {
     if (key == null)
     {
-      throw new Error(
-              "Implementation error: Cannot have null alignment property key.");
+      throw new Error(MessageManager.getString("error.implementation_error_cannot_have_null_alignment"));
     }
     if (value == null)
     {
@@ -264,15 +246,8 @@ public abstract class AlignFile extends FileParse
 
   /**
    * This method must be implemented to parse the contents of the file.
- * @throws ExceptionFileFormatOrSyntax 
- * @throws SAXException 
- * @throws ParserConfigurationException 
- * @throws ExceptionLoadingFailed 
- * @throws ExceptionPermissionDenied 
- * @throws InterruptedException 
- * @throws ExceptionUnmatchedClosingParentheses 
    */
-  public abstract void parse() throws IOException, ExceptionFileFormatOrSyntax, ParserConfigurationException, SAXException, ExceptionPermissionDenied, ExceptionLoadingFailed, InterruptedException, ExceptionUnmatchedClosingParentheses;
+  public abstract void parse() throws IOException;
 
   /**
    * Print out in alignment file format the Sequences in the seqs Vector.