X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fappletgui%2FSeqPanel.java;h=de4d979cbb51029be351892c43906e5e6424847a;hb=13f678a057d4bf84c0b7bd0dbf37c42599158d7e;hp=5238750ef1b5db471208223d72e4263760568acf;hpb=59d682209891099d46b960509907c79e3fb276fe;p=jalview.git
diff --git a/src/jalview/appletgui/SeqPanel.java b/src/jalview/appletgui/SeqPanel.java
index 5238750..de4d979 100644
--- a/src/jalview/appletgui/SeqPanel.java
+++ b/src/jalview/appletgui/SeqPanel.java
@@ -1,19 +1,22 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * 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.
+ * 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 .
+ * 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;
@@ -28,6 +31,7 @@ import jalview.schemes.*;
import jalview.structure.SelectionSource;
import jalview.structure.SequenceListener;
import jalview.structure.StructureSelectionManager;
+import jalview.util.MessageManager;
public class SeqPanel extends Panel implements MouseMotionListener,
MouseListener, SequenceListener
@@ -146,7 +150,7 @@ public class SeqPanel extends Panel implements MouseMotionListener,
SequenceI sequence = (Sequence) av.getAlignment().getSequenceAt(
seqCanvas.cursorY);
- seqCanvas.cursorX = sequence.findIndex(getKeyboardNo1() - 1);
+ seqCanvas.cursorX = sequence.findIndex(getKeyboardNo1()) - 1;
scrollToVisible();
}
@@ -345,26 +349,36 @@ public class SeqPanel extends Panel implements MouseMotionListener,
int getKeyboardNo1()
{
- if (keyboardNo1 == null)
- return 1;
- else
+ try
+ {
+ if (keyboardNo1 != null)
+ {
+ int value = Integer.parseInt(keyboardNo1.toString());
+ keyboardNo1 = null;
+ return value;
+ }
+ } catch (Exception x)
{
- int value = Integer.parseInt(keyboardNo1.toString());
- keyboardNo1 = null;
- return value;
}
+ keyboardNo1 = null;
+ return 1;
}
int getKeyboardNo2()
{
- if (keyboardNo2 == null)
- return 1;
- else
+ try
+ {
+ if (keyboardNo2 != null)
+ {
+ int value = Integer.parseInt(keyboardNo2.toString());
+ keyboardNo2 = null;
+ return value;
+ }
+ } catch (Exception x)
{
- int value = Integer.parseInt(keyboardNo2.toString());
- keyboardNo2 = null;
- return value;
}
+ keyboardNo2 = null;
+ return 1;
}
void setStatusMessage(SequenceI sequence, int res, int seq)
@@ -932,15 +946,15 @@ public class SeqPanel extends Panel implements MouseMotionListener,
StringBuffer message = new StringBuffer();
if (groupEditing)
{
- message.append("Edit group:");
+ message.append(MessageManager.getString("action.edit_group")).append(":");
if (editCommand == null)
{
- editCommand = new EditCommand("Edit Group");
+ editCommand = new EditCommand(MessageManager.getString("action.edit_group"));
}
}
else
{
- message.append("Edit sequence: " + seq.getName());
+ message.append(MessageManager.getString("label.edit_sequence")).append(" " + seq.getName());
String label = seq.getName();
if (label.length() > 10)
{
@@ -948,7 +962,7 @@ public class SeqPanel extends Panel implements MouseMotionListener,
}
if (editCommand == null)
{
- editCommand = new EditCommand("Edit " + label);
+ editCommand = new EditCommand(MessageManager.formatMessage("label.edit_params", new String[]{label}));
}
}