X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fdbsources%2FEBIAlfaFold.java;fp=src%2Fjalview%2Fws%2Fdbsources%2FEBIAlfaFold.java;h=e3687bdb037306d2bb6a814c615f9a1720d96f43;hb=3459a8a691cb22508d7067f240b7254e588e77d3;hp=4449b0b04e5abbc0e7307e332fa97ff06dab01f2;hpb=5b27f1062b2203c4c31702e205f4c78e1992063e;p=jalview.git diff --git a/src/jalview/ws/dbsources/EBIAlfaFold.java b/src/jalview/ws/dbsources/EBIAlfaFold.java index 4449b0b..e3687bd 100644 --- a/src/jalview/ws/dbsources/EBIAlfaFold.java +++ b/src/jalview/ws/dbsources/EBIAlfaFold.java @@ -84,7 +84,7 @@ public class EBIAlfaFold extends EbiFileRetrievedProxy @Override public Regex getAccessionValidator() { - Regex validator = new Regex("(AF-[A-Z]+[0-9]+[A-Z0-9]+-F1)"); + Regex validator = new Regex("(AF-[A-Z]+[0-9]+[A-Z0-9]+-F1)"); validator.setIgnoreCase(true); return validator; } @@ -126,7 +126,9 @@ public class EBIAlfaFold extends EbiFileRetrievedProxy { return getSequenceRecords(queries, null); } - public AlignmentI getSequenceRecords(String queries, String retrievalUrl) throws Exception + + public AlignmentI getSequenceRecords(String queries, String retrievalUrl) + throws Exception { AlignmentI pdbAlignment = null; String chain = null; @@ -158,7 +160,7 @@ public class EBIAlfaFold extends EbiFileRetrievedProxy { File tmpFile = File.createTempFile(id, ".cif"); UrlDownloadClient.download(alphaFoldCif, tmpFile); - + // may not need this check ? file = tmpFile.getAbsolutePath(); if (file == null) @@ -166,8 +168,8 @@ public class EBIAlfaFold extends EbiFileRetrievedProxy return null; } - pdbAlignment = importDownloadedStructureFromUrl(alphaFoldCif, tmpFile, id, chain, getDbSource(),getDbVersion()); - + pdbAlignment = importDownloadedStructureFromUrl(alphaFoldCif, tmpFile, + id, chain, getDbSource(), getDbVersion()); if (pdbAlignment == null || pdbAlignment.getHeight() < 1) { @@ -185,7 +187,9 @@ public class EBIAlfaFold extends EbiFileRetrievedProxy } /** - * general purpose structure importer - designed to yield alignment useful for transfer of annotation to associated sequences + * general purpose structure importer - designed to yield alignment useful for + * transfer of annotation to associated sequences + * * @param alphaFoldCif * @param tmpFile * @param id @@ -195,8 +199,9 @@ public class EBIAlfaFold extends EbiFileRetrievedProxy * @return * @throws Exception */ - public static AlignmentI importDownloadedStructureFromUrl(String alphaFoldCif, - File tmpFile, String id, String chain, String dbSource, String dbVersion) throws Exception + public static AlignmentI importDownloadedStructureFromUrl( + String alphaFoldCif, File tmpFile, String id, String chain, + String dbSource, String dbVersion) throws Exception { String file = tmpFile.getAbsolutePath(); // todo get rid of Type and use FileFormatI instead? @@ -249,15 +254,17 @@ public class EBIAlfaFold extends EbiFileRetrievedProxy // dbentry.setMap() pdbcs.addDBRef(dbentry); // update any feature groups - List allsf = pdbcs.getFeatures().getAllFeatures(); + List allsf = pdbcs.getFeatures() + .getAllFeatures(); List newsf = new ArrayList(); - if (allsf!=null && allsf.size()>0) + if (allsf != null && allsf.size() > 0) { - for (SequenceFeature f:allsf) + for (SequenceFeature f : allsf) { if (file.equals(f.getFeatureGroup())) { - f = new SequenceFeature(f, f.type, f.begin, f.end, id, f.score); + f = new SequenceFeature(f, f.type, f.begin, f.end, id, + f.score); } newsf.add(f); }