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-1565 loading a concise file causes insertions to be automatically hidden in desktop
[jalview.git]
/
src
/
jalview
/
gui
/
AnnotationPanel.java
diff --git
a/src/jalview/gui/AnnotationPanel.java
b/src/jalview/gui/AnnotationPanel.java
index
9f56206
..
e5bed74
100755
(executable)
--- a/
src/jalview/gui/AnnotationPanel.java
+++ b/
src/jalview/gui/AnnotationPanel.java
@@
-1,6
+1,6
@@
/*
/*
- * 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.
*
*
* This file is part of Jalview.
*
@@
-241,7
+241,7
@@
public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
public void adjustmentValueChanged(AdjustmentEvent evt)
{
// update annotation label display
public void adjustmentValueChanged(AdjustmentEvent evt)
{
// update annotation label display
- ap.alabels.setScrollOffset(-evt.getValue());
+ ap.getAlabels().setScrollOffset(-evt.getValue());
}
/**
}
/**
@@
-566,7
+566,7
@@
public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
return;
}
return;
}
- ap.scalePanel.mousePressed(evt);
+ ap.getScalePanel().mousePressed(evt);
}
}
@@
-582,7
+582,7
@@
public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
graphStretch = -1;
graphStretchY = -1;
mouseDragging = false;
graphStretch = -1;
graphStretchY = -1;
mouseDragging = false;
- ap.scalePanel.mouseReleased(evt);
+ ap.getScalePanel().mouseReleased(evt);
}
/**
}
/**
@@
-594,7
+594,7
@@
public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
@Override
public void mouseEntered(MouseEvent evt)
{
@Override
public void mouseEntered(MouseEvent evt)
{
- ap.scalePanel.mouseEntered(evt);
+ ap.getScalePanel().mouseEntered(evt);
}
/**
}
/**
@@
-606,7
+606,7
@@
public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
@Override
public void mouseExited(MouseEvent evt)
{
@Override
public void mouseExited(MouseEvent evt)
{
- ap.scalePanel.mouseExited(evt);
+ ap.getScalePanel().mouseExited(evt);
}
/**
}
/**
@@
-632,7
+632,7
@@
public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
}
else
{
}
else
{
- ap.scalePanel.mouseDragged(evt);
+ ap.getScalePanel().mouseDragged(evt);
}
}
}
}
@@
-809,7
+809,7
@@
public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
{
try
{
{
try
{
- image = new BufferedImage(imgWidth, ap.annotationPanel.getHeight(),
+ image = new BufferedImage(imgWidth, ap.getAnnotationPanel().getHeight(),
BufferedImage.TYPE_INT_RGB);
} catch (OutOfMemoryError oom)
{
BufferedImage.TYPE_INT_RGB);
} catch (OutOfMemoryError oom)
{
@@
-1013,9
+1013,9
@@
public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
@Override
public int[] getVisibleVRange()
{
@Override
public int[] getVisibleVRange()
{
- if (ap != null && ap.alabels != null)
+ if (ap != null && ap.getAlabels() != null)
{
{
- int sOffset = -ap.alabels.scrollOffset;
+ int sOffset = -ap.getAlabels().getScrollOffset();
int visHeight = sOffset + ap.annotationSpaceFillerHolder.getHeight();
bounds[0] = sOffset;
bounds[1] = visHeight;
int visHeight = sOffset + ap.annotationSpaceFillerHolder.getHeight();
bounds[0] = sOffset;
bounds[1] = visHeight;