X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFeatureRenderer.java;h=e22f506d662e1160d10dc0fceb1a7b5576f50b88;hb=f1698a3cc3dbeb218b63b157ff46bd092882537d;hp=c2a84c6e79bfc83e2b902737ea1e1b9bb4b74f8d;hpb=de32fd704f78dafa5bed5eb64f9f96fab320971f;p=jalview.git diff --git a/src/jalview/gui/FeatureRenderer.java b/src/jalview/gui/FeatureRenderer.java index c2a84c6..e22f506 100644 --- a/src/jalview/gui/FeatureRenderer.java +++ b/src/jalview/gui/FeatureRenderer.java @@ -21,9 +21,6 @@ package jalview.gui; import jalview.api.FeatureColourI; -import jalview.datamodel.AlignedCodonFrame; -import jalview.datamodel.Mapping; -import jalview.datamodel.SearchResultMatchI; import jalview.datamodel.SearchResults; import jalview.datamodel.SearchResultsI; import jalview.datamodel.SequenceFeature; @@ -272,8 +269,8 @@ public class FeatureRenderer name.setText(sf.getType()); description.setText(sf.getDescription()); group.setText(sf.getFeatureGroup()); - start.setValue(new Integer(sf.getBegin())); - end.setValue(new Integer(sf.getEnd())); + start.setValue(Integer.valueOf(sf.getBegin())); + end.setValue(Integer.valueOf(sf.getEnd())); SearchResultsI highlight = new SearchResults(); highlight.addResult(sequences.get(0), sf.getBegin(), @@ -360,8 +357,8 @@ public class FeatureRenderer name.setText(featureType); group.setText(featureGroup); - start.setValue(new Integer(firstFeature.getBegin())); - end.setValue(new Integer(firstFeature.getEnd())); + start.setValue(Integer.valueOf(firstFeature.getBegin())); + end.setValue(Integer.valueOf(firstFeature.getEnd())); description.setText(firstFeature.getDescription()); updateColourButton(mainPanel, colour, (oldcol = fcol = getFeatureStyle(featureType))); @@ -577,49 +574,4 @@ public class FeatureRenderer { Arrays.sort(renderOrder, order); } - - /** - * Answers a (possibly empty) list of features in this alignment at a position - * (or range) which is mappable from the given sequence residue position in a - * mapped alignment. - * - * @param sequence - * @param pos - * @return - */ - public List findComplementFeaturesAtResidue( - SequenceI sequence, int pos) - { - SequenceI ds = sequence.getDatasetSequence(); - List result = new ArrayList<>(); - List mappings = this.av.getAlignment() - .getCodonFrame(sequence); - for (AlignedCodonFrame acf : mappings) - { - Mapping mapping = acf.getMappingForSequence(sequence); - if (mapping.getMap().getFromRatio() == mapping.getMap().getToRatio()) - { - continue; // we are only looking for 3:1 or 1:3 mappings - } - SearchResultsI sr = new SearchResults(); - acf.markMappedRegion(ds, pos, sr); - for (SearchResultMatchI match : sr.getResults()) - { - for (int i = match.getStart(); i <= match.getEnd(); i++) - { - List fs = findFeaturesAtResidue( - match.getSequence(), i); - for (SequenceFeature sf : fs) - { - if (!result.contains(sf)) - { - result.addAll(fs); - } - } - } - } - } - - return result; - } }