X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FIdPanel.java;h=deb116747ca98fd9754bb80b29a8e465a536e8e2;hb=ab43013b7e357b84b4abade0dba949668dfb2a0e;hp=0480ffa6c6314f136df9fc37f5892c7442b32c22;hpb=f52f7b378972cc884b5d3e5cc250f89667f558f7;p=jalview.git

diff --git a/src/jalview/gui/IdPanel.java b/src/jalview/gui/IdPanel.java
index 0480ffa..deb1167 100755
--- a/src/jalview/gui/IdPanel.java
+++ b/src/jalview/gui/IdPanel.java
@@ -1,35 +1,51 @@
 /*
- * 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.2b1)
+ * 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.
- *
- * 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
+ * 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 
  * 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 <http://www.gnu.org/licenses/>.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.gui;
 
-import java.awt.*;
-import java.awt.event.*;
+import jalview.datamodel.Sequence;
+import jalview.datamodel.SequenceFeature;
+import jalview.datamodel.SequenceGroup;
+import jalview.datamodel.SequenceI;
+import jalview.io.SequenceAnnotationReport;
+import jalview.util.MessageManager;
+import jalview.util.UrlLink;
+
+import java.awt.BorderLayout;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
+import java.awt.event.MouseWheelEvent;
+import java.awt.event.MouseWheelListener;
 import java.util.List;
 import java.util.Vector;
 
-import javax.swing.*;
-
-import jalview.datamodel.*;
-import jalview.util.UrlLink;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
+import javax.swing.ToolTipManager;
 
 /**
- * DOCUMENT ME!
- *
+ * This panel hosts alignment sequence ids and responds to mouse clicks on them,
+ * as well as highlighting ids matched by a search from the Find menu.
+ * 
  * @author $author$
  * @version $Revision$
  */
@@ -53,13 +69,13 @@ public class IdPanel extends JPanel implements MouseListener,
 
   boolean mouseDragging = false;
 
+  private final SequenceAnnotationReport seqAnnotReport;
+
   /**
    * Creates a new IdPanel object.
-   *
+   * 
    * @param av
-   *          DOCUMENT ME!
    * @param parent
-   *          DOCUMENT ME!
    */
   public IdPanel(AlignViewport av, AlignmentPanel parent)
   {
@@ -67,6 +83,7 @@ public class IdPanel extends JPanel implements MouseListener,
     alignPanel = parent;
     idCanvas = new IdCanvas(av);
     linkImageURL = getClass().getResource("/images/link.gif").toString();
+    seqAnnotReport = new SequenceAnnotationReport(linkImageURL);
     setLayout(new BorderLayout());
     add(idCanvas, BorderLayout.CENTER);
     addMouseListener(this);
@@ -76,8 +93,9 @@ public class IdPanel extends JPanel implements MouseListener,
   }
 
   /**
-   * DOCUMENT ME!
-   *
+   * Respond to mouse movement by constructing tooltip text for the sequence id
+   * under the mouse.
+   * 
    * @param e
    *          DOCUMENT ME!
    */
@@ -86,71 +104,24 @@ public class IdPanel extends JPanel implements MouseListener,
   {
     SeqPanel sp = alignPanel.seqPanel;
     int seq = Math.max(0, sp.findSeq(e));
-    String tmp;
     if (seq > -1 && seq < av.getAlignment().getHeight())
     {
       SequenceI sequence = av.getAlignment().getSequenceAt(seq);
-      StringBuffer tip = new StringBuffer();
-      tip.append("<i>");
-
-      int maxWidth = 0;
-      if (sequence.getDescription() != null)
-      {
-        tmp = sequence.getDescription();
-        tip.append("<br>" + tmp);
-        maxWidth = Math.max(maxWidth, tmp.length());
-      }
-
-      DBRefEntry[] dbrefs = sequence.getDatasetSequence().getDBRef();
-      if (av.isShowDbRefs() && dbrefs != null)
-      {
-        for (int i = 0; i < dbrefs.length; i++)
-        {
-          tip.append("<br>");
-          tmp = dbrefs[i].getSource() + " " + dbrefs[i].getAccessionId();
-          tip.append(tmp);
-          maxWidth = Math.max(maxWidth, tmp.length());
-        }
-      }
-
-      // ADD NON POSITIONAL SEQUENCE INFO
-      SequenceFeature[] features = sequence.getDatasetSequence()
-              .getSequenceFeatures();
-      SequenceFeature[] tfeat = new SequenceFeature[1];
-      if (av.isShowNpFeats() && features != null)
-      {
-        for (int i = 0; i < features.length; i++)
-        {
-          if (features[i].begin == 0 && features[i].end == 0)
-          {
-            int sz = -tip.length();
-            tfeat[0] = features[i];
-            sp.appendFeatures(tip, linkImageURL, 0, tfeat,
-                    sp.seqCanvas.fr.minmax);
-            sz += tip.length();
-            maxWidth = Math.max(maxWidth, sz);
-          }
-        }
-      }
-
-      if (maxWidth > 60)
-      {
-        tip.insert(0, "<table width=350 border=0><tr><td><i>");
-        tip.append("</i></td></tr></table>");
-      }
-
-      tip.append("</html>");
-
+      StringBuffer tip = new StringBuffer(64);
+      seqAnnotReport
+              .createSequenceAnnotationReport(tip, sequence,
+                      av.isShowDbRefs(), av.isShowNpFeats(),
+                      sp.seqCanvas.fr.minmax);
       setToolTipText("<html>" + sequence.getDisplayId(true) + " "
-              + tip.toString());
+              + tip.toString() + "</html>");
     }
   }
 
   /**
-   * DOCUMENT ME!
-   *
+   * Responds to a mouse drag by selecting the sequences under the dragged
+   * region.
+   * 
    * @param e
-   *          DOCUMENT ME!
    */
   @Override
   public void mouseDragged(MouseEvent e)
@@ -172,35 +143,60 @@ public class IdPanel extends JPanel implements MouseListener,
     alignPanel.paintAlignment(true);
   }
 
+  /**
+   * Response to the mouse wheel by scrolling the alignment panel.
+   */
   @Override
   public void mouseWheelMoved(MouseWheelEvent e)
   {
     e.consume();
     if (e.getWheelRotation() > 0)
     {
-      alignPanel.scrollUp(false);
+      if (e.isShiftDown())
+      {
+        alignPanel.scrollRight(true);
+      }
+      else
+      {
+        alignPanel.scrollUp(false);
+      }
     }
     else
     {
-      alignPanel.scrollUp(true);
+      if (e.isShiftDown())
+      {
+        alignPanel.scrollRight(false);
+      }
+      else
+      {
+        alignPanel.scrollUp(true);
+      }
     }
   }
 
   /**
-   * DOCUMENT ME!
-   *
+   * Handle a mouse click event. Currently only responds to a double-click. The
+   * action is to try to open a browser window at a URL that searches for the
+   * selected sequence id. The search URL is configured in Preferences |
+   * Connections | URL link from Sequence ID. For example:
+   * 
+   * http://www.ebi.ac.uk/ebisearch/search.ebi?db=allebi&query=$SEQUENCE_ID$
+   * 
    * @param e
-   *          DOCUMENT ME!
    */
   @Override
   public void mouseClicked(MouseEvent e)
   {
-    if (e.getClickCount() < 2)
+    /*
+     * Ignore single click. Ignore 'left' click followed by 'right' click (user
+     * selects a row then its pop-up menu).
+     */
+    if (e.getClickCount() < 2 || SwingUtilities.isRightMouseButton(e))
     {
       return;
     }
 
-    java.util.Vector links = Preferences.sequenceURLLinks;
+    Vector links = Preferences.sequenceURLLinks;
     if (links == null || links.size() < 1)
     {
       return;
@@ -251,17 +247,15 @@ public class IdPanel extends JPanel implements MouseListener,
       JOptionPane
               .showInternalMessageDialog(
                       Desktop.desktop,
-                      "Unixers: Couldn't find default web browser."
-                              + "\nAdd the full path to your browser in Preferences.",
-                      "Web browser not found", JOptionPane.WARNING_MESSAGE);
+                      MessageManager.getString("label.web_browser_not_found_unix"),
+                      MessageManager.getString("label.web_browser_not_found"), JOptionPane.WARNING_MESSAGE);
       ex.printStackTrace();
     }
-
   }
 
   /**
    * DOCUMENT ME!
-   *
+   * 
    * @param e
    *          DOCUMENT ME!
    */
@@ -276,7 +270,7 @@ public class IdPanel extends JPanel implements MouseListener,
 
   /**
    * DOCUMENT ME!
-   *
+   * 
    * @param e
    *          DOCUMENT ME!
    */
@@ -301,28 +295,36 @@ public class IdPanel extends JPanel implements MouseListener,
   }
 
   /**
-   * DOCUMENT ME!
-   *
+   * Respond to a mouse press. Does nothing for (left) double-click as this is
+   * handled by mouseClicked().
+   * 
+   * Right mouse down - construct and show context menu.
+   * 
+   * Ctrl-down or Shift-down - add to or expand current selection group if there
+   * is one.
+   * 
+   * Mouse down - select this sequence.
+   * 
    * @param e
-   *          DOCUMENT ME!
    */
   @Override
   public void mousePressed(MouseEvent e)
   {
-    if (e.getClickCount() == 2)
+    if (e.getClickCount() == 2 && SwingUtilities.isLeftMouseButton(e))
     {
       return;
     }
 
     int seq = alignPanel.seqPanel.findSeq(e);
 
-    if (javax.swing.SwingUtilities.isRightMouseButton(e))
+    if (SwingUtilities.isRightMouseButton(e))
     {
       Sequence sq = (Sequence) av.getAlignment().getSequenceAt(seq);
       // build a new links menu based on the current links + any non-positional
       // features
       Vector nlinks = new Vector(Preferences.sequenceURLLinks);
-      SequenceFeature sf[] = sq==null ? null : sq.getDatasetSequence().getSequenceFeatures();
+      SequenceFeature sf[] = sq == null ? null : sq.getDatasetSequence()
+              .getSequenceFeatures();
       for (int sl = 0; sf != null && sl < sf.length; sl++)
       {
         if (sf[sl].begin == sf[sl].end && sf[sl].begin == 0)
@@ -365,10 +367,9 @@ public class IdPanel extends JPanel implements MouseListener,
   }
 
   /**
-   * DOCUMENT ME!
-   *
+   * Toggle whether the sequence is part of the current selection group.
+   * 
    * @param seq
-   *          DOCUMENT ME!
    */
   void selectSeq(int seq)
   {
@@ -379,12 +380,11 @@ public class IdPanel extends JPanel implements MouseListener,
   }
 
   /**
-   * DOCUMENT ME!
-   *
+   * Add contiguous rows of the alignment to the current selection group. Does
+   * nothing if there is no selection group.
+   * 
    * @param start
-   *          DOCUMENT ME!
    * @param end
-   *          DOCUMENT ME!
    */
   void selectSeqs(int start, int end)
   {
@@ -411,15 +411,15 @@ public class IdPanel extends JPanel implements MouseListener,
     for (int i = start; i <= end; i++)
     {
       av.getSelectionGroup().addSequence(
-              av.getAlignment().getSequenceAt(i), true);
+              av.getAlignment().getSequenceAt(i), i == end);
     }
   }
 
   /**
-   * DOCUMENT ME!
-   *
+   * Respond to mouse released. Refreshes the display and triggers broadcast of
+   * the new selection group to any listeners.
+   * 
    * @param e
-   *          DOCUMENT ME!
    */
   @Override
   public void mouseReleased(MouseEvent e)
@@ -436,10 +436,10 @@ public class IdPanel extends JPanel implements MouseListener,
   }
 
   /**
-   * DOCUMENT ME!
-   *
+   * Highlight sequence ids that match the given list, and if necessary scroll
+   * to the start sequence of the list.
+   * 
    * @param list
-   *          DOCUMENT ME!
    */
   public void highlightSearchResults(List<SequenceI> list)
   {