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-1139_proguard' into develop
[jalview.git]
/
src
/
jalview
/
appletgui
/
AnnotationLabels.java
diff --git
a/src/jalview/appletgui/AnnotationLabels.java
b/src/jalview/appletgui/AnnotationLabels.java
index
d20881b
..
a4b7af2
100755
(executable)
--- a/
src/jalview/appletgui/AnnotationLabels.java
+++ b/
src/jalview/appletgui/AnnotationLabels.java
@@
-21,9
+21,9
@@
import java.util.*;
import java.awt.*;
import java.awt.event.*;
import java.awt.*;
import java.awt.event.*;
-import java.awt.image.BufferedImage;
import jalview.datamodel.*;
import jalview.datamodel.*;
+import jalview.util.MessageManager;
import jalview.util.ParseHtmlBodyAndLinks;
public class AnnotationLabels extends Panel implements ActionListener,
import jalview.util.ParseHtmlBodyAndLinks;
public class AnnotationLabels extends Panel implements ActionListener,
@@
-406,7
+406,7
@@
public class AnnotationLabels extends Panel implements ActionListener,
if ((evt.getModifiers() & InputEvent.BUTTON3_MASK) == InputEvent.BUTTON3_MASK)
{
if ((evt.getModifiers() & InputEvent.BUTTON3_MASK) == InputEvent.BUTTON3_MASK)
{
- PopupMenu popup = new PopupMenu("Annotations");
+ PopupMenu popup = new PopupMenu(MessageManager.getString("label.annotations"));
MenuItem item = new MenuItem(ADDNEW);
item.addActionListener(this);
MenuItem item = new MenuItem(ADDNEW);
item.addActionListener(this);
@@
-763,11
+763,11
@@
public class AnnotationLabels extends Panel implements ActionListener,
dragEvent.getY());
}
dragEvent.getY());
}
- if ((aa == null) || (aa.length < 1))
+ if (!av.wrapAlignment && ((aa == null) || (aa.length < 1)))
{
g.setColor(Color.black);
{
g.setColor(Color.black);
- g.drawString("Right click", 2, 8);
- g.drawString("to add annotation", 2, 18);
+ g.drawString(MessageManager.getString("label.right_click"), 2, 8);
+ g.drawString(MessageManager.getString("label.to_add_annotation"), 2, 18);
}
}
}
}
}
}