/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*/
package jalview.ws.dbsources;
-import jalview.datamodel.Alignment;
+import jalview.datamodel.AlignmentAnnotation;
+import jalview.datamodel.AlignmentI;
import jalview.datamodel.DBRefEntry;
import jalview.datamodel.DBRefSource;
import jalview.datamodel.PDBEntry;
import jalview.datamodel.SequenceI;
+import jalview.io.AppletFormatAdapter;
+import jalview.io.FormatAdapter;
+import jalview.util.MessageManager;
+import jalview.ws.ebi.EBIFetchClient;
+import jalview.ws.seqfetcher.DbSourceProxy;
import java.util.ArrayList;
import java.util.List;
import java.util.Vector;
-import MCview.PDBChain;
-import MCview.PDBfile;
-
import com.stevesoft.pat.Regex;
-import jalview.datamodel.AlignmentI;
-import jalview.io.FormatAdapter;
-import jalview.ws.ebi.EBIFetchClient;
-import jalview.ws.seqfetcher.DbSourceProxy;
-
/**
* @author JimP
*
{
pdbfile = new FormatAdapter().readFile(file,
- jalview.io.AppletFormatAdapter.FILE, "PDB");
+ AppletFormatAdapter.FILE, "PDB");
if (pdbfile != null)
{
- List<SequenceI> toremove=new ArrayList<SequenceI>();
+ List<SequenceI> toremove = new ArrayList<SequenceI>();
for (SequenceI pdbcs : pdbfile.getSequences())
{
String chid = null;
// Mapping map=null;
- for (PDBEntry pid : (Vector<PDBEntry>) pdbcs.getPDBId())
+ for (PDBEntry pid : pdbcs.getPDBId())
{
if (pid.getFile() == file)
{
- chid = (String) pid.getProperty().get("CHAIN");
+ chid = pid.getChainCode();
}
;
|| chid.trim().equals(chain.trim()) || (chain
.trim().length() == 0 && chid.equals("_")))))
{
- pdbcs.setName(jalview.datamodel.DBRefSource.PDB + "|" + id
+ pdbcs.setName(DBRefSource.PDB + "|" + id
+ "|" + pdbcs.getName());
// Might need to add more metadata to the PDBEntry object
// like below
}
else
{
- // mark this sequence to be removed from the alignment
+ // mark this sequence to be removed from the alignment
// - since it's not from the right chain
toremove.add(pdbcs);
}
}
- // now remove marked sequences
- for (SequenceI pdbcs:toremove) {
+ // now remove marked sequences
+ for (SequenceI pdbcs : toremove)
+ {
pdbfile.deleteSequence(pdbcs);
+ if (pdbcs.getAnnotation()!=null)
+ {
+ for (AlignmentAnnotation aa: pdbcs.getAnnotation())
+ {
+ pdbfile.deleteAnnotation(aa);
+ }
+ }
}
}
-
+
if (pdbfile == null || pdbfile.getHeight() < 1)
{
- throw new Exception("No PDB Records for " + id + " chain "
- + ((chain == null) ? "' '" : chain));
+ throw new Exception(MessageManager.formatMessage("exception.no_pdb_records_for_chain", new String[]{id, ((chain == null) ? "' '" : chain)}));
}
} catch (Exception ex) // Problem parsing PDB file