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-629 example files from nf-core
[jalview.git]
/
src
/
jalview
/
appletgui
/
AnnotationPanel.java
diff --git
a/src/jalview/appletgui/AnnotationPanel.java
b/src/jalview/appletgui/AnnotationPanel.java
index
50a9e33
..
aa047d1
100755
(executable)
--- a/
src/jalview/appletgui/AnnotationPanel.java
+++ b/
src/jalview/appletgui/AnnotationPanel.java
@@
-99,14
+99,14
@@
public class AnnotationPanel extends Panel
public static int GRAPH_HEIGHT = 40;
public static int GRAPH_HEIGHT = 40;
- boolean MAC = false;
+ // boolean MAC = false;
public final AnnotationRenderer renderer;
public AnnotationPanel(AlignmentPanel ap)
{
new jalview.util.Platform();
public final AnnotationRenderer renderer;
public AnnotationPanel(AlignmentPanel ap)
{
new jalview.util.Platform();
- MAC = Platform.isAMac();
+ // MAC = Platform.isAMac();
this.ap = ap;
av = ap.av;
setLayout(null);
this.ap = ap;
av = ap.av;
setLayout(null);
@@
-343,7
+343,7
@@
public class AnnotationPanel extends Panel
{
activeRow = i;
}
{
activeRow = i;
}
- else if (aa[i].graph > 0)
+ else if (aa[i].graph != AlignmentAnnotation.NO_GRAPH)
{
// Stretch Graph
graphStretch = i;
{
// Stretch Graph
graphStretch = i;
@@
-354,8
+354,8
@@
public class AnnotationPanel extends Panel
}
}
}
}
- if ((evt.getModifiers()
- & InputEvent.BUTTON3_MASK) == InputEvent.BUTTON3_MASK
+ if ((evt.getModifiersEx()
+ & InputEvent.BUTTON3_DOWN_MASK) == InputEvent.BUTTON3_DOWN_MASK
&& activeRow != -1)
{
if (av.getColumnSelection() == null
&& activeRow != -1)
{
if (av.getColumnSelection() == null
@@
-480,7
+480,7
@@
public class AnnotationPanel extends Panel
if (av.hasHiddenColumns())
{
column = av.getAlignment().getHiddenColumns()
if (av.hasHiddenColumns())
{
column = av.getAlignment().getHiddenColumns()
- .adjustForHiddenColumns(column);
+ .visibleToAbsoluteColumn(column);
}
if (row > -1 && column < aa[row].annotations.length
}
if (row > -1 && column < aa[row].annotations.length