X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAnnotationLabels.java;h=858c055dc3deba637837bfe48dbcca9b99a916e8;hb=dfa04e77181fccfa6229ffef1591fc9c622d9b39;hp=963efee47ca3579256ba7d25d8691842ef2be00b;hpb=b57a02c25e335d033c97f8a6bacd6b54f62bd2b6;p=jalview.git diff --git a/src/jalview/appletgui/AnnotationLabels.java b/src/jalview/appletgui/AnnotationLabels.java index 963efee..858c055 100755 --- a/src/jalview/appletgui/AnnotationLabels.java +++ b/src/jalview/appletgui/AnnotationLabels.java @@ -1,19 +1,20 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7) - * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1) + * Copyright (C) 2014 The Jalview Authors * * This file is part of Jalview. * * Jalview is free software: you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - * + * * Jalview is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty * of MERCHANTABILITY or FITNESS FOR A PARTICULAR * PURPOSE. See the GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along with Jalview. If not, see . + * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.appletgui; @@ -21,9 +22,9 @@ import java.util.*; import java.awt.*; import java.awt.event.*; -import java.awt.image.BufferedImage; import jalview.datamodel.*; +import jalview.util.MessageManager; import jalview.util.ParseHtmlBodyAndLinks; public class AnnotationLabels extends Panel implements ActionListener, @@ -406,7 +407,7 @@ public class AnnotationLabels extends Panel implements ActionListener, 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); @@ -763,11 +764,11 @@ public class AnnotationLabels extends Panel implements ActionListener, dragEvent.getY()); } - if ((aa == null) || (aa.length < 1)) + if (!av.wrapAlignment && ((aa == null) || (aa.length < 1))) { 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); } } }