From 2c2ac117a3d29360070c143ff2480edc213e5d78 Mon Sep 17 00:00:00 2001 From: gmungoc Date: Mon, 5 Nov 2018 14:32:07 +0000 Subject: [PATCH] JAL-3148 pull up getSequenceRenderer to AlignmentViewPanel --- src/jalview/api/AlignmentViewPanel.java | 2 ++ .../api/{SequenceRenderer.java => SequenceRendererI.java} | 2 +- src/jalview/appletgui/AlignmentPanel.java | 3 ++- src/jalview/gui/AlignmentPanel.java | 7 +++++++ 4 files changed, 12 insertions(+), 2 deletions(-) rename src/jalview/api/{SequenceRenderer.java => SequenceRendererI.java} (96%) diff --git a/src/jalview/api/AlignmentViewPanel.java b/src/jalview/api/AlignmentViewPanel.java index 0b1ca21..676c943 100644 --- a/src/jalview/api/AlignmentViewPanel.java +++ b/src/jalview/api/AlignmentViewPanel.java @@ -57,6 +57,8 @@ public interface AlignmentViewPanel extends OOMHandlerI FeatureRenderer getFeatureRenderer(); FeatureRenderer cloneFeatureRenderer(); + + SequenceRendererI getSequenceRenderer(); /** * diff --git a/src/jalview/api/SequenceRenderer.java b/src/jalview/api/SequenceRendererI.java similarity index 96% rename from src/jalview/api/SequenceRenderer.java rename to src/jalview/api/SequenceRendererI.java index 54f7fb6..66fcae0 100644 --- a/src/jalview/api/SequenceRenderer.java +++ b/src/jalview/api/SequenceRendererI.java @@ -25,7 +25,7 @@ import jalview.renderer.seqfeatures.FeatureColourFinder; import java.awt.Color; -public interface SequenceRenderer +public interface SequenceRendererI { Color getResidueColour(SequenceI seq, int position, diff --git a/src/jalview/appletgui/AlignmentPanel.java b/src/jalview/appletgui/AlignmentPanel.java index 83d8ade..f881a1c 100644 --- a/src/jalview/appletgui/AlignmentPanel.java +++ b/src/jalview/appletgui/AlignmentPanel.java @@ -23,6 +23,7 @@ package jalview.appletgui; import jalview.analysis.AnnotationSorter; import jalview.api.AlignViewportI; import jalview.api.AlignmentViewPanel; +import jalview.api.SequenceRendererI; import jalview.bin.JalviewLite; import jalview.datamodel.AlignmentI; import jalview.datamodel.SearchResultsI; @@ -177,7 +178,7 @@ public class AlignmentPanel extends Panel return av; } - public SequenceRenderer getSequenceRenderer() + public SequenceRendererI getSequenceRenderer() { return seqPanel.seqCanvas.sr; } diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java index 60ef480..64e0113 100644 --- a/src/jalview/gui/AlignmentPanel.java +++ b/src/jalview/gui/AlignmentPanel.java @@ -23,6 +23,7 @@ package jalview.gui; import jalview.analysis.AnnotationSorter; import jalview.api.AlignViewportI; import jalview.api.AlignmentViewPanel; +import jalview.api.SequenceRendererI; import jalview.bin.Cache; import jalview.datamodel.AlignmentI; import jalview.datamodel.HiddenColumns; @@ -1785,4 +1786,10 @@ public class AlignmentPanel extends GAlignmentPanel implements { return calculationDialog; } + + @Override + public SequenceRendererI getSequenceRenderer() + { + return new SequenceRenderer(av); + } } -- 1.7.10.2