X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FIdPanel.java;h=80337250f6049733a1a78844b21264ae41b3add7;hb=be51efa72c8b34fc2d4dba1beb11185210215c2e;hp=b973913802ed7d06bd0c9190d708155de885c4a6;hpb=7d4f1d8e997964bef5c351d04fbdafe4401cf5d7;p=jalview.git

diff --git a/src/jalview/appletgui/IdPanel.java b/src/jalview/appletgui/IdPanel.java
index b973913..8033725 100755
--- a/src/jalview/appletgui/IdPanel.java
+++ b/src/jalview/appletgui/IdPanel.java
@@ -1,20 +1,19 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4)
- * Copyright (C) 2008 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
+ * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
  * 
- * This program 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 2
- * of the License, or (at your option) any later version.
+ * This file is part of Jalview.
  * 
- * This program 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.
+ * 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.
  * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ * 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/>.
  */
 package jalview.appletgui;
 
@@ -58,6 +57,7 @@ public class IdPanel extends Panel implements MouseListener,
     idCanvas.addMouseMotionListener(this);
 
     String label, url;
+    // TODO: add in group link parameter
     if (av.applet != null)
     {
       for (int i = 1; i < 10; i++)
@@ -87,33 +87,65 @@ public class IdPanel extends Panel implements MouseListener,
     int seq = alignPanel.seqPanel.findSeq(e);
 
     SequenceI sequence = av.getAlignment().getSequenceAt(seq);
-    
+
     // look for non-pos features
     StringBuffer tooltiptext = new StringBuffer();
-    
 
     if (sequence.getDescription() != null)
     {
       tooltiptext.append(sequence.getDescription());
       tooltiptext.append("\n");
     }
-    
+
     SequenceFeature sf[] = sequence.getSequenceFeatures();
-    for (int sl=0;sf!=null && sl<sf.length;sl++)
+    for (int sl = 0; sf != null && sl < sf.length; sl++)
     {
-      if (sf[sl].begin==sf[sl].end && sf[sl].begin==0)
+      if (sf[sl].begin == sf[sl].end && sf[sl].begin == 0)
       {
-        boolean nl=false;
-        if (sf[sl].getFeatureGroup()!=null) { tooltiptext.append(sf[sl].getFeatureGroup()); nl=true;};
-        if (sf[sl].getType()!=null) { tooltiptext.append(" "); tooltiptext.append(sf[sl].getType()); nl=true;};
-        if (sf[sl].getDescription()!=null) { tooltiptext.append(" "); tooltiptext.append(sf[sl].getDescription()); nl=true;};
-        if (sf[sl].getScore()!=Float.NaN && sf[sl].getScore()!=0f) { tooltiptext.append(" Score = "); tooltiptext.append(sf[sl].getScore()); nl=true;};
-        if (sf[sl].getStatus()!=null && sf[sl].getStatus().length()>0) { tooltiptext.append(" ("); tooltiptext.append(sf[sl].getStatus()); tooltiptext.append(")");nl=true;};
-        if (nl) {tooltiptext.append("\n"); }
+        boolean nl = false;
+        if (sf[sl].getFeatureGroup() != null)
+        {
+          tooltiptext.append(sf[sl].getFeatureGroup());
+          nl = true;
+        }
+        ;
+        if (sf[sl].getType() != null)
+        {
+          tooltiptext.append(" ");
+          tooltiptext.append(sf[sl].getType());
+          nl = true;
+        }
+        ;
+        if (sf[sl].getDescription() != null)
+        {
+          tooltiptext.append(" ");
+          tooltiptext.append(sf[sl].getDescription());
+          nl = true;
+        }
+        ;
+        if (sf[sl].getScore() != Float.NaN && sf[sl].getScore() != 0f)
+        {
+          tooltiptext.append(" Score = ");
+          tooltiptext.append(sf[sl].getScore());
+          nl = true;
+        }
+        ;
+        if (sf[sl].getStatus() != null && sf[sl].getStatus().length() > 0)
+        {
+          tooltiptext.append(" (");
+          tooltiptext.append(sf[sl].getStatus());
+          tooltiptext.append(")");
+          nl = true;
+        }
+        ;
+        if (nl)
+        {
+          tooltiptext.append("\n");
+        }
       }
     }
-    
-    if (tooltiptext.length()==0)
+
+    if (tooltiptext.length() == 0)
     {
       // nothing to display - so clear tooltip if one is visible
       if (tooltip != null)
@@ -134,7 +166,7 @@ public class IdPanel extends Panel implements MouseListener,
       tooltip.setTip(sequence.getDisplayId(true) + "\n"
               + tooltiptext.toString());
     }
-    tooltiptext=null;
+    tooltiptext = null;
   }
 
   public void mouseDragged(MouseEvent e)
@@ -258,29 +290,29 @@ public class IdPanel extends Panel implements MouseListener,
 
     if ((e.getModifiers() & InputEvent.BUTTON3_MASK) == InputEvent.BUTTON3_MASK)
     {
-      Sequence sq = (Sequence) av
-      .getAlignment().getSequenceAt(seq);
-      // build a new links menu based on the current links + any non-positional features
+      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();
-      for (int l=0,lSize=links.size();l<lSize; l++)
+      for (int l = 0, lSize = links.size(); l < lSize; l++)
       {
         nlinks.addElement(links.elementAt(l));
       }
       SequenceFeature sf[] = sq.getSequenceFeatures();
-      for (int sl=0;sf!=null && sl<sf.length;sl++)
+      for (int sl = 0; sf != null && sl < sf.length; sl++)
       {
-        if (sf[sl].begin==sf[sl].end && sf[sl].begin==0)
+        if (sf[sl].begin == sf[sl].end && sf[sl].begin == 0)
         {
-          if (sf[sl].links!=null && sf[sl].links.size()>0)
+          if (sf[sl].links != null && sf[sl].links.size() > 0)
           {
-            for (int l=0, lSize=sf[sl].links.size(); l<lSize; l++)
-            { 
+            for (int l = 0, lSize = sf[sl].links.size(); l < lSize; l++)
+            {
               nlinks.addElement(sf[sl].links.elementAt(l));
             }
           }
         }
       }
-      
+
       APopupMenu popup = new APopupMenu(alignPanel, sq, nlinks);
       this.add(popup);
       popup.show(this, e.getX(), e.getY());