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
Merge branch 'develop' into trialMerge
[jalview.git]
/
test
/
jalview
/
ws
/
sifts
/
SiftsClientTest.java
diff --git
a/test/jalview/ws/sifts/SiftsClientTest.java
b/test/jalview/ws/sifts/SiftsClientTest.java
index
f71c20d
..
45c5412
100644
(file)
--- a/
test/jalview/ws/sifts/SiftsClientTest.java
+++ b/
test/jalview/ws/sifts/SiftsClientTest.java
@@
-27,7
+27,7
@@
import jalview.datamodel.DBRefSource;
import jalview.datamodel.Sequence;
import jalview.datamodel.SequenceI;
import jalview.gui.JvOptionPane;
import jalview.datamodel.Sequence;
import jalview.datamodel.SequenceI;
import jalview.gui.JvOptionPane;
-import jalview.io.AppletFormatAdapter;
+import jalview.io.DataSourceType;
import jalview.structure.StructureMapping;
import jalview.xml.binding.sifts.Entry.Entity;
import jalview.structure.StructureMapping;
import jalview.xml.binding.sifts.Entry.Entity;
@@
-194,7
+194,7
@@
public class SiftsClientTest
try
{
pdbFile = new PDBfile(false, false, false, "test/jalview/io/"
try
{
pdbFile = new PDBfile(false, false, false, "test/jalview/io/"
- + testPDBId + ".pdb", AppletFormatAdapter.FILE);
+ + testPDBId + ".pdb", DataSourceType.FILE);
siftsClient = new SiftsClient(pdbFile);
} catch (Exception e)
{
siftsClient = new SiftsClient(pdbFile);
} catch (Exception e)
{
@@
-465,7
+465,7
@@
public class SiftsClientTest
try
{
pdbFile = new PDBfile(false, false, false, "test/jalview/io/2nq2"
try
{
pdbFile = new PDBfile(false, false, false, "test/jalview/io/2nq2"
- + ".pdb", AppletFormatAdapter.FILE);
+ + ".pdb", DataSourceType.FILE);
siftsClientX = new SiftsClient(pdbFile);
} catch (Exception e)
{
siftsClientX = new SiftsClient(pdbFile);
} catch (Exception e)
{
@@
-493,7
+493,7
@@
public class SiftsClientTest
try
{
pdbFile = new PDBfile(false, false, false,
try
{
pdbFile = new PDBfile(false, false, false,
- "test/jalview/io/3ucu.cif", AppletFormatAdapter.FILE);
+ "test/jalview/io/3ucu.cif", DataSourceType.FILE);
siftsClientX = new SiftsClient(pdbFile);
} catch (Exception e)
{
siftsClientX = new SiftsClient(pdbFile);
} catch (Exception e)
{