- Vector sfeat = new Vector();
- jalview.datamodel.SequenceFeature[] sfarray=seq.getSequenceFeatures();
- if (sfarray!=null && sfarray.length>0) {
- for (int i=0;i<sfarray.length;i++)
- sfeat.add(sfarray[i]);
- }
- sqinfo.put("SeqFeatures", sfeat);
- sqinfo.put("PdbId",
- (seq.getPDBId() != null) ? seq.getPDBId() : new Vector());
- sqinfo.put("datasetSequence", (seq.getDatasetSequence() !=null) ? seq.getDatasetSequence() : new Sequence("THISISAPLACEHOLDER",""));
+ }
+
+ Vector<SequenceFeature> sfeat = new Vector<SequenceFeature>();
+ List<SequenceFeature> sfs = seq.getFeatures().getAllFeatures();
+ sfeat.addAll(sfs);
+
+ if (seq.getDatasetSequence() == null)
+ {
+ sqinfo.put("SeqFeatures", sfeat);
+ sqinfo.put("PdbId",
+ (seq.getAllPDBEntries() != null) ? seq.getAllPDBEntries()
+ : new Vector<PDBEntry>());
+ }
+ else
+ {
+ sqinfo.put("datasetSequence",
+ (seq.getDatasetSequence() != null) ? seq.getDatasetSequence()
+ : new Sequence("THISISAPLACEHOLDER", ""));
+ }