X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fio%2FPIRFile.java;h=adfc1cbdd8173d6e31c73a5f357b48c72c011040;hb=a9177efb4097815d9a8031aa22700c61a7d6260a;hp=fcd790e8880ae161c64cb8dc9b5057c50fb90d22;hpb=e601d78bc7762386f570e346a803684c43a66ff1;p=jalview.git
diff --git a/src/jalview/io/PIRFile.java b/src/jalview/io/PIRFile.java
index fcd790e..adfc1cb 100755
--- a/src/jalview/io/PIRFile.java
+++ b/src/jalview/io/PIRFile.java
@@ -1,26 +1,31 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ 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 .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.io;
-import java.io.*;
-import java.util.*;
+import jalview.datamodel.Sequence;
+import jalview.datamodel.SequenceI;
+import jalview.util.Comparison;
-import jalview.datamodel.*;
+import java.io.IOException;
+import java.util.Vector;
public class PIRFile extends AlignFile
{
@@ -32,9 +37,10 @@ public class PIRFile extends AlignFile
{
}
- public PIRFile(String inFile, String type) throws IOException
+ public PIRFile(String inFile, DataSourceType sourceType)
+ throws IOException
{
- super(inFile, type);
+ super(inFile, sourceType);
}
public PIRFile(FileParse source) throws IOException
@@ -42,6 +48,7 @@ public class PIRFile extends AlignFile
super(source);
}
+ @Override
public void parse() throws IOException
{
StringBuffer sequence;
@@ -52,7 +59,7 @@ public class PIRFile extends AlignFile
{
if (line.length() == 0)
{
- // System.out.println("blank line");
+ // jalview.bin.Console.outPrintln("blank line");
continue;
}
if (line.indexOf("C;") == 0 || line.indexOf("#") == 0)
@@ -96,14 +103,10 @@ public class PIRFile extends AlignFile
}
}
- public String print()
- {
- return print(getSeqsAsArray());
- }
-
- public String print(SequenceI[] s)
+ @Override
+ public String print(SequenceI[] s, boolean jvsuffix)
{
- boolean is_NA = jalview.util.Comparison.isNucleotide(s);
+ boolean is_NA = Comparison.isNucleotide(s);
int len = 72;
StringBuffer out = new StringBuffer();
int i = 0;
@@ -155,7 +158,7 @@ public class PIRFile extends AlignFile
}
else
{
- out.append(">P1;" + printId(s[i]));
+ out.append(">P1;" + printId(s[i], jvsuffix));
out.append(newline);
if (s[i].getDescription() != null)
{
@@ -170,7 +173,8 @@ public class PIRFile extends AlignFile
}
}
}
- int nochunks = (seq.length() / len) + 1;
+ int nochunks = (seq.length() / len)
+ + (seq.length() % len > 0 ? 1 : 0);
for (int j = 0; j < nochunks; j++)
{