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
file format enum wip changes
[jalview.git]
/
src
/
jalview
/
ws
/
dbsources
/
Pdb.java
diff --git
a/src/jalview/ws/dbsources/Pdb.java
b/src/jalview/ws/dbsources/Pdb.java
index
2421b82
..
6f266dd
100644
(file)
--- a/
src/jalview/ws/dbsources/Pdb.java
+++ b/
src/jalview/ws/dbsources/Pdb.java
@@
-1,3
+1,4
@@
+
/*
* Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
* Copyright (C) $$Year-Rel$$ The Jalview Authors
/*
* Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
* Copyright (C) $$Year-Rel$$ The Jalview Authors
@@
-29,6
+30,7
@@
import jalview.datamodel.PDBEntry;
import jalview.datamodel.SequenceI;
import jalview.io.FormatAdapter;
import jalview.io.PDBFeatureSettings;
import jalview.datamodel.SequenceI;
import jalview.io.FormatAdapter;
import jalview.io.PDBFeatureSettings;
+import jalview.structure.StructureImportSettings;
import jalview.util.MessageManager;
import jalview.ws.ebi.EBIFetchClient;
import jalview.util.MessageManager;
import jalview.ws.ebi.EBIFetchClient;
@@
-53,8
+55,6
@@
public class Pdb extends EbiFileRetrievedProxy
public static final String FEATURE_RES_NUM = "RESNUM";
public static final String FEATURE_RES_NUM = "RESNUM";
- private static String currentDefaultFomart = DBRefSource.MMCIF;
-
/*
* (non-Javadoc)
*
/*
* (non-Javadoc)
*
@@
-132,11
+132,13
@@
public class Pdb extends EbiFileRetrievedProxy
stopQuery();
return null;
}
stopQuery();
return null;
}
- String ext = getCurrentDefaultFomart().equalsIgnoreCase("mmcif") ? ".cif"
+ String ext = StructureImportSettings.getCurrentDefaultFormat()
+ .equalsIgnoreCase("mmcif") ? ".cif"
: ".xml";
EBIFetchClient ebi = new EBIFetchClient();
file = ebi.fetchDataAsFile("pdb:" + id,
: ".xml";
EBIFetchClient ebi = new EBIFetchClient();
file = ebi.fetchDataAsFile("pdb:" + id,
- getCurrentDefaultFomart().toLowerCase(), "raw", ext)
+ StructureImportSettings.getCurrentDefaultFormat().toLowerCase(),
+ ext)
.getAbsolutePath();
stopQuery();
if (file == null)
.getAbsolutePath();
stopQuery();
if (file == null)
@@
-147,8
+149,8
@@
public class Pdb extends EbiFileRetrievedProxy
{
pdbAlignment = new FormatAdapter().readFile(file,
{
pdbAlignment = new FormatAdapter().readFile(file,
- jalview.io.AppletFormatAdapter.FILE,
- getCurrentDefaultFomart());
+ jalview.io.DataSourceType.FILE,
+ StructureImportSettings.getCurrentDefaultFormat());
if (pdbAlignment != null)
{
List<SequenceI> toremove = new ArrayList<SequenceI>();
if (pdbAlignment != null)
{
List<SequenceI> toremove = new ArrayList<SequenceI>();
@@
-243,12
+245,12
@@
public class Pdb extends EbiFileRetrievedProxy
}
/**
}
/**
- * obtain human glyoxalase chain A sequence
+ * human glyoxalase
*/
@Override
public String getTestQuery()
{
*/
@Override
public String getTestQuery()
{
- return "1QIPA";
+ return "1QIP";
}
@Override
}
@Override
@@
-263,15
+265,6
@@
public class Pdb extends EbiFileRetrievedProxy
return 0;
}
return 0;
}
- public static String getCurrentDefaultFomart()
- {
- return currentDefaultFomart;
- }
-
- public static void setCurrentDefaultFomart(String currentDefaultFomart)
- {
- Pdb.currentDefaultFomart = currentDefaultFomart;
- }
/**
* Returns a descriptor for suitable feature display settings with
/**
* Returns a descriptor for suitable feature display settings with