X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FSeqPanel.java;h=429183db9c36f14bfedf6334b0971eb3f68b0a79;hb=865a855a4ca87eadb3e5ff284ed32ed307d9c34b;hp=5238750ef1b5db471208223d72e4263760568acf;hpb=59d682209891099d46b960509907c79e3fb276fe;p=jalview.git diff --git a/src/jalview/appletgui/SeqPanel.java b/src/jalview/appletgui/SeqPanel.java index 5238750..429183d 100644 --- a/src/jalview/appletgui/SeqPanel.java +++ b/src/jalview/appletgui/SeqPanel.java @@ -1,6 +1,6 @@ /* - * 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.0b1) + * Copyright (C) 2014 The Jalview Authors * * This file is part of Jalview. * @@ -14,6 +14,7 @@ * 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; @@ -146,7 +147,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(); } @@ -342,31 +343,35 @@ public class SeqPanel extends Panel implements MouseMotionListener, keyboardNo1.append(value); } } - 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) + {} + 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) + {} + keyboardNo2 = null; + return 1; } - + void setStatusMessage(SequenceI sequence, int res, int seq) { StringBuffer text = new StringBuffer("Sequence " + (seq + 1) + " ID: "