git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-2416 order score models by order of addition rather than name
[jalview.git]
/
src
/
jalview
/
io
/
FileParse.java
diff --git
a/src/jalview/io/FileParse.java
b/src/jalview/io/FileParse.java
index
71640f4
..
dc0418f
100755
(executable)
--- a/
src/jalview/io/FileParse.java
+++ b/
src/jalview/io/FileParse.java
@@
-23,6
+23,7
@@
package jalview.io;
import jalview.api.AlignExportSettingI;
import jalview.api.AlignViewportI;
import jalview.api.AlignmentViewPanel;
import jalview.api.AlignExportSettingI;
import jalview.api.AlignViewportI;
import jalview.api.AlignmentViewPanel;
+import jalview.api.FeatureSettingsModelI;
import jalview.util.MessageManager;
import java.io.BufferedReader;
import jalview.util.MessageManager;
import java.io.BufferedReader;
@@
-94,7
+95,7
@@
public class FileParse
*/
protected String suffix = null;
*/
protected String suffix = null;
- protected String type = null;
+ protected DataSourceType dataSourceType = null;
protected BufferedReader dataIn = null;
protected BufferedReader dataIn = null;
@@
-138,7
+139,7
@@
public class FileParse
suffix = from.suffix;
errormessage = from.errormessage; // inherit potential error messages
error = false; // reset any error condition.
suffix = from.suffix;
errormessage = from.errormessage; // inherit potential error messages
error = false; // reset any error condition.
- type = from.type;
+ dataSourceType = from.dataSourceType;
dataIn = from.dataIn;
if (dataIn != null)
{
dataIn = from.dataIn;
if (dataIn != null)
{
@@
-278,9
+279,9
@@
public class FileParse
* configurable values for the origin and the type of the source
*/
public FileParse(BufferedReader source, String originString,
* configurable values for the origin and the type of the source
*/
public FileParse(BufferedReader source, String originString,
- String typeString)
+ DataSourceType sourceType)
{
{
- type = typeString;
+ dataSourceType = sourceType;
error = false;
inFile = null;
dataName = originString;
error = false;
inFile = null;
dataName = originString;
@@
-303,18
+304,18
@@
public class FileParse
*
* @param fileStr
* - datasource locator/content
*
* @param fileStr
* - datasource locator/content
- * @param type
+ * @param sourceType
* - protocol of source
* @throws MalformedURLException
* @throws IOException
*/
* - protocol of source
* @throws MalformedURLException
* @throws IOException
*/
- public FileParse(String fileStr, String type)
+ public FileParse(String fileStr, DataSourceType sourceType)
throws MalformedURLException, IOException
{
throws MalformedURLException, IOException
{
- this.type = type;
+ this.dataSourceType = sourceType;
error = false;
error = false;
- if (type.equals(AppletFormatAdapter.FILE))
+ if (sourceType == DataSourceType.FILE)
{
if (checkFileSource(fileStr))
{
{
if (checkFileSource(fileStr))
{
@@
-337,7
+338,7
@@
public class FileParse
}
}
}
}
}
}
- else if (type.equals(AppletFormatAdapter.URL))
+ else if (sourceType == DataSourceType.URL)
{
try
{
{
try
{
@@
-374,13
+375,13
@@
public class FileParse
error = true;
}
}
error = true;
}
}
- else if (type.equals(AppletFormatAdapter.PASTE))
+ else if (sourceType == DataSourceType.PASTE)
{
errormessage = "PASTE INACCESSIBLE!";
dataIn = new BufferedReader(new StringReader(fileStr));
dataName = "Paste";
}
{
errormessage = "PASTE INACCESSIBLE!";
dataIn = new BufferedReader(new StringReader(fileStr));
dataName = "Paste";
}
- else if (type.equals(AppletFormatAdapter.CLASSLOADER))
+ else if (sourceType == DataSourceType.CLASSLOADER)
{
errormessage = "RESOURCE CANNOT BE LOCATED";
java.io.InputStream is = getClass()
{
errormessage = "RESOURCE CANNOT BE LOCATED";
java.io.InputStream is = getClass()
@@
-406,7
+407,7
@@
public class FileParse
else
{
errormessage = "PROBABLE IMPLEMENTATION ERROR : Datasource Type given as '"
else
{
errormessage = "PROBABLE IMPLEMENTATION ERROR : Datasource Type given as '"
- + (type != null ? type : "null") + "'";
+ + (sourceType != null ? sourceType : "null") + "'";
error = true;
}
if (dataIn == null || error)
error = true;
}
if (dataIn == null || error)
@@
-481,11
+482,19
@@
public class FileParse
}
/**
}
/**
- * rewinds the datasource the beginning.
+ * Rewinds the datasource to the marked point if possible
+ *
+ * @param bytesRead
*
*/
*
*/
- public void reset() throws IOException
+ public void reset(int bytesRead) throws IOException
{
{
+ if (bytesRead >= READAHEAD_LIMIT)
+ {
+ System.err.println(String.format(
+ "File reset error: read %d bytes but reset limit is %d",
+ bytesRead, READAHEAD_LIMIT));
+ }
if (dataIn != null && !error)
{
dataIn.reset();
if (dataIn != null && !error)
{
dataIn.reset();
@@
-605,4
+614,20
@@
public class FileParse
}
// could also set export/import settings
}
}
// could also set export/import settings
}
+
+ /**
+ * Returns the preferred feature colour configuration if there is one, else
+ * null
+ *
+ * @return
+ */
+ public FeatureSettingsModelI getFeatureColourScheme()
+ {
+ return null;
+ }
+
+ public DataSourceType getDataSourceType()
+ {
+ return dataSourceType;
+ }
}
}