X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FIdPanel.java;h=258b8b6b3891f7126f100afd388519b44e9a5aa1;hb=bb8129c04f80504354b02b0876538ba680e11529;hp=d73668b66b77622fc0a9a45bfd0bc84b7877743f;hpb=865a855a4ca87eadb3e5ff284ed32ed307d9c34b;p=jalview.git diff --git a/src/jalview/appletgui/IdPanel.java b/src/jalview/appletgui/IdPanel.java index d73668b..258b8b6 100755 --- a/src/jalview/appletgui/IdPanel.java +++ b/src/jalview/appletgui/IdPanel.java @@ -1,30 +1,40 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ 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; -import java.awt.*; -import java.awt.event.*; +import java.awt.BorderLayout; +import java.awt.Panel; +import java.awt.event.InputEvent; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; +import java.awt.event.MouseMotionListener; import java.util.List; import java.util.Vector; -import jalview.datamodel.*; +import jalview.datamodel.Sequence; +import jalview.datamodel.SequenceFeature; +import jalview.datamodel.SequenceGroup; +import jalview.datamodel.SequenceI; import jalview.util.UrlLink; +import jalview.viewmodel.AlignmentViewport; public class IdPanel extends Panel implements MouseListener, MouseMotionListener @@ -32,16 +42,12 @@ public class IdPanel extends Panel implements MouseListener, protected IdCanvas idCanvas; - protected AlignViewport av; + protected AlignmentViewport av; protected AlignmentPanel alignPanel; ScrollThread scrollThread = null; - int offy; - - int width; - int lastid = -1; boolean mouseDragging = false; @@ -301,7 +307,7 @@ public class IdPanel extends Panel implements MouseListener, int y = e.getY(); if (av.getWrapAlignment()) { - y -= 2 * av.charHeight; + y -= 2 * av.getCharHeight(); } int seq = alignPanel.seqPanel.findSeq(e); @@ -489,5 +495,4 @@ public class IdPanel extends Panel implements MouseListener, } } } - }