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
Merge branch 'JAL-1403' into develop
[jalview.git]
/
src
/
jalview
/
appletgui
/
AnnotationPanel.java
diff --git
a/src/jalview/appletgui/AnnotationPanel.java
b/src/jalview/appletgui/AnnotationPanel.java
index
f63cb76
..
7129eee
100755
(executable)
--- a/
src/jalview/appletgui/AnnotationPanel.java
+++ b/
src/jalview/appletgui/AnnotationPanel.java
@@
-25,6
+25,7
@@
import java.awt.event.*;
import jalview.datamodel.*;
import jalview.renderer.AnnotationRenderer;
import jalview.renderer.AwtRenderPanelI;
import jalview.datamodel.*;
import jalview.renderer.AnnotationRenderer;
import jalview.renderer.AwtRenderPanelI;
+import jalview.util.MessageManager;
public class AnnotationPanel extends Panel implements AwtRenderPanelI,
AdjustmentListener, ActionListener, MouseListener,
public class AnnotationPanel extends Panel implements AwtRenderPanelI,
AdjustmentListener, ActionListener, MouseListener,
@@
-253,10
+254,10
@@
public class AnnotationPanel extends Panel implements AwtRenderPanelI,
}
}
}
}
- aa[activeRow].validateRangeAndDisplay();
+ av.getAlignment().validateAnnotation(aa[activeRow]);
- adjustPanelHeight();
ap.alignmentChanged();
ap.alignmentChanged();
+ adjustPanelHeight();
repaint();
return;
repaint();
return;
@@
-317,7
+318,7
@@
public class AnnotationPanel extends Panel implements AwtRenderPanelI,
return;
}
return;
}
- PopupMenu pop = new PopupMenu("Structure type");
+ PopupMenu pop = new PopupMenu(MessageManager.getString("label.structure_type"));
MenuItem item;
/*
* Just display the needed structure options
MenuItem item;
/*
* Just display the needed structure options
@@
-618,7
+619,7
@@
public class AnnotationPanel extends Panel implements AwtRenderPanelI,
g.setColor(Color.black);
if (av.validCharWidth)
{
g.setColor(Color.black);
if (av.validCharWidth)
{
- g.drawString("Alignment has no annotations", 20, 15);
+ g.drawString(MessageManager.getString("label.alignment_has_no_annotations"), 20, 15);
}
return;
}
return;