X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FSeqPanel.java;h=89289c001d400292ad7c559ba86bcbcf03b64b9f;hb=28a4f823a8d3e6eae1a4569d8022c5a20fd0e3c7;hp=a5dfb83cf5a2b5dc4f9f409302ea2c173c0b79ee;hpb=b57a02c25e335d033c97f8a6bacd6b54f62bd2b6;p=jalview.git diff --git a/src/jalview/appletgui/SeqPanel.java b/src/jalview/appletgui/SeqPanel.java index a5dfb83..89289c0 100644 --- a/src/jalview/appletgui/SeqPanel.java +++ b/src/jalview/appletgui/SeqPanel.java @@ -1,13 +1,13 @@ /* - * 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) + * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle * * 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 @@ -146,7 +146,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 +342,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: "