X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FIdPanel.java;h=4509ab3391b31325ab1dbf74e70c8cf67be84c2a;hb=c4fe29146bd25f9b70603e62ab97422088fb71ff;hp=5e15283e80671d9eb79730adb8ae155a6b782b5a;hpb=491ef50a485fbff6e610c0cd138e5cf89538aa3d;p=jalview.git diff --git a/src/jalview/gui/IdPanel.java b/src/jalview/gui/IdPanel.java index 5e15283..4509ab3 100755 --- a/src/jalview/gui/IdPanel.java +++ b/src/jalview/gui/IdPanel.java @@ -18,10 +18,6 @@ public class IdPanel extends JPanel implements MouseListener, MouseMotionListene public int lastid; - - boolean mouseDown; - boolean mouseUp; - public IdPanel(AlignViewport av, AlignmentPanel parent) { this.av = av; @@ -42,14 +38,15 @@ public class IdPanel extends JPanel implements MouseListener, MouseMotionListene end = tmp; } - for (int i = start; i <= end; i++) { + for (int i = start; i <= end; i++) + { SequenceI pickedSeq = av.getAlignment().getSequenceAt(i); - if (av.getSelection().contains(pickedSeq)) { + if (av.getSelection().contains(pickedSeq)) av.getSelection().removeElement(pickedSeq); - } else { + else av.getSelection().addElement(pickedSeq); - } + } repaint(); @@ -58,17 +55,17 @@ public class IdPanel extends JPanel implements MouseListener, MouseMotionListene public void mouseDragged(MouseEvent e) { int y = e.getY(); - int seq = av.getIndex(y); - if (mouseDown == true) { - if (seq < lastid) { - selectSeqs(lastid-1,seq); - } else if (seq > lastid) { - selectSeqs(lastid+1,seq); - } - lastid = seq; - } + + + + if (seq < lastid) + selectSeqs(lastid - 1, seq); + else if (seq > lastid) + selectSeqs(lastid + 1, seq); + + lastid = seq; return; } @@ -98,12 +95,11 @@ public class IdPanel extends JPanel implements MouseListener, MouseMotionListene int y = e.getY(); int seq = av.getIndex(y); - mouseDown = true; if( javax.swing.SwingUtilities.isRightMouseButton(e)) { String id = av.getAlignment().getSequenceAt(seq).getName(); - String s = (String)JOptionPane.showInputDialog( + String s = (String)JOptionPane.showInternalInputDialog( this, "Edit sequence name", "Edit sequence name", @@ -129,13 +125,9 @@ public class IdPanel extends JPanel implements MouseListener, MouseMotionListene return; } - public void mouseReleased(MouseEvent e) { + public void mouseReleased(MouseEvent e) + { lastid = -1; - - mouseDown = false; - mouseUp = true; - PaintRefresher.Refresh(this); - } }