git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-2189 source formatting
[jalview.git]
/
src
/
jalview
/
workers
/
AlignmentAnnotationFactory.java
diff --git
a/src/jalview/workers/AlignmentAnnotationFactory.java
b/src/jalview/workers/AlignmentAnnotationFactory.java
index
f804a19
..
9c9ea83
100644
(file)
--- a/
src/jalview/workers/AlignmentAnnotationFactory.java
+++ b/
src/jalview/workers/AlignmentAnnotationFactory.java
@@
-32,11
+32,11
@@
public class AlignmentAnnotationFactory
{
// TODO need an interface for AlignFrame by which to access
// its AlignViewportI and AlignmentViewPanel
{
// TODO need an interface for AlignFrame by which to access
// its AlignViewportI and AlignmentViewPanel
- AlignFrame currentAlignFrame = Jalview.getCurrentAlignFrame() ;
+ AlignmentViewPanel currentAlignFrame = Jalview.getCurrentAlignFrame().alignPanel;
if (currentAlignFrame != null)
{
if (currentAlignFrame != null)
{
- newCalculator(currentAlignFrame.getViewport(), currentAlignFrame
- .getAlignPanels().get(0), counter);
+ newCalculator(currentAlignFrame.getAlignViewport(),
+ currentAlignFrame, counter);
}
else
{
}
else
{
@@
-69,7
+69,7
@@
public class AlignmentAnnotationFactory
{
// TODO need an interface for AlignFrame by which to access
// its AlignViewportI and AlignmentViewPanel
{
// TODO need an interface for AlignFrame by which to access
// its AlignViewportI and AlignmentViewPanel
- AlignFrame currentAlignFrame = Jalview.getCurrentAlignFrame() ;
+ AlignFrame currentAlignFrame = Jalview.getCurrentAlignFrame();
if (currentAlignFrame != null)
{
newCalculator(currentAlignFrame.getViewport(), currentAlignFrame
if (currentAlignFrame != null)
{
newCalculator(currentAlignFrame.getViewport(), currentAlignFrame
@@
-91,8
+91,7
@@
public class AlignmentAnnotationFactory
* provider of AlignmentAnnotation for the alignment
*/
public static void newCalculator(AlignViewportI viewport,
* provider of AlignmentAnnotation for the alignment
*/
public static void newCalculator(AlignViewportI viewport,
- AlignmentViewPanel panel,
- AnnotationProviderI calculator)
+ AlignmentViewPanel panel, AnnotationProviderI calculator)
{
new AnnotationWorker(viewport, panel, calculator);
}
{
new AnnotationWorker(viewport, panel, calculator);
}