git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5f8a96e
)
refactored protocol check to jalview.io.FileParse
author
jprocter
<Jim Procter>
Sun, 14 Nov 2010 14:58:59 +0000
(14:58 +0000)
committer
jprocter
<Jim Procter>
Sun, 14 Nov 2010 14:58:59 +0000
(14:58 +0000)
src/jalview/bin/Jalview.java
patch
|
blob
|
history
diff --git
a/src/jalview/bin/Jalview.java
b/src/jalview/bin/Jalview.java
index
39daac6
..
57fb00a
100755
(executable)
--- a/
src/jalview/bin/Jalview.java
+++ b/
src/jalview/bin/Jalview.java
@@
-36,6
+36,7
@@
import java.util.*;
import javax.swing.*;
import jalview.gui.*;
import javax.swing.*;
import jalview.gui.*;
+import jalview.io.FileParse;
import jalview.util.Platform;
/**
import jalview.util.Platform;
/**
@@
-248,7
+249,7
@@
public class Jalview
{
try
{
{
try
{
- String viprotocol = Jalview.checkProtocol(vamsasImport);
+ String viprotocol = FileParse.checkProtocol(vamsasImport);
if (viprotocol == jalview.io.FormatAdapter.FILE)
{
inSession = desktop.vamsasImport(new File(vamsasImport));
if (viprotocol == jalview.io.FormatAdapter.FILE)
{
inSession = desktop.vamsasImport(new File(vamsasImport));
@@
-333,7
+334,7
@@
public class Jalview
}
}
}
}
- protocol = checkProtocol(file);
+ protocol = FileParse.checkProtocol(file);
format = new jalview.io.IdentifyFile().Identify(file, protocol);
format = new jalview.io.IdentifyFile().Identify(file, protocol);
@@
-369,13
+370,13
@@
public class Jalview
data = aparser.getValue("groups", true);
if (data != null)
{
data = aparser.getValue("groups", true);
if (data != null)
{
- af.parseFeaturesFile(data, checkProtocol(data));
+ af.parseFeaturesFile(data, FileParse.checkProtocol(data));
System.out.println("Added " + data);
}
data = aparser.getValue("features", true);
if (data != null)
{
System.out.println("Added " + data);
}
data = aparser.getValue("features", true);
if (data != null)
{
- af.parseFeaturesFile(data, checkProtocol(data));
+ af.parseFeaturesFile(data, FileParse.checkProtocol(data));
System.out.println("Added " + data);
}
System.out.println("Added " + data);
}
@@
-400,7
+401,7
@@
public class Jalview
jalview.io.NewickFile fin = null;
try
{
jalview.io.NewickFile fin = null;
try
{
- fin = new jalview.io.NewickFile(data, checkProtocol(data));
+ fin = new jalview.io.NewickFile(data, FileParse.checkProtocol(data));
if (fin != null)
{
af.getViewport().setCurrentTree(
if (fin != null)
{
af.getViewport().setCurrentTree(
@@
-791,17
+792,6
@@
public class Jalview
}
return ff;
}
}
return ff;
}
-
- private static String checkProtocol(String file)
- {
- String protocol = jalview.io.FormatAdapter.FILE;
-
- if (file.indexOf("http:") > -1 || file.indexOf("file:") > -1)
- {
- protocol = jalview.io.FormatAdapter.URL;
- }
- return protocol;
- }
}
/**
}
/**