X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGStructureChooser.java;h=c4043c49539d80c6d1b6dd5993b1d47ca759d07e;hb=4d7f98a6dd54d9863ba449ec79dcd95d25ed863d;hp=85960810a1d64efa35e2f9f4c87f567157e3817d;hpb=5713273d984e4de3b840ae7295ca8b151d8743cc;p=jalview.git

diff --git a/src/jalview/jbgui/GStructureChooser.java b/src/jalview/jbgui/GStructureChooser.java
index 8596081..c4043c4 100644
--- a/src/jalview/jbgui/GStructureChooser.java
+++ b/src/jalview/jbgui/GStructureChooser.java
@@ -24,6 +24,7 @@ package jalview.jbgui;
 import jalview.datamodel.SequenceI;
 import jalview.gui.AlignmentPanel;
 import jalview.gui.Desktop;
+import jalview.gui.JvSwingUtils;
 import jalview.jbgui.PDBDocFieldPreferences.PreferenceSource;
 import jalview.util.MessageManager;
 import jalview.ws.dbsources.PDBRestClient;
@@ -74,7 +75,7 @@ public abstract class GStructureChooser extends JPanel implements
   protected JComboBox<FilterOption> cmb_filterOption = new JComboBox<FilterOption>();
 
   protected AlignmentPanel ap;
-  
+
   protected StringBuilder errorWarning = new StringBuilder();
 
   protected JLabel lbl_result = new JLabel(
@@ -135,7 +136,6 @@ public abstract class GStructureChooser extends JPanel implements
 
   protected JLabel lbl_fromFileStatus = new JLabel(errorImage);
 
-
   protected AssciateSeqPanel idInputAssSeqPanel = new AssciateSeqPanel();
 
   protected AssciateSeqPanel fileChooserAssSeqPanel = new AssciateSeqPanel();
@@ -148,10 +148,32 @@ public abstract class GStructureChooser extends JPanel implements
 
   protected static final String VIEWS_LOCAL_PDB = "VIEWS_LOCAL_PDB";
 
-  protected JTable tbl_summary = new JTable();
+  protected JTable tbl_summary = new JTable()
+  {
+    public String getToolTipText(MouseEvent evt)
+    {
+      String toolTipText = null;
+      java.awt.Point pnt = evt.getPoint();
+      int rowIndex = rowAtPoint(pnt);
+      int colIndex = columnAtPoint(pnt);
+
+      try
+      {
+        toolTipText = getValueAt(rowIndex, colIndex).toString();
+      } catch (Exception e)
+      {
+        e.printStackTrace();
+      }
+      toolTipText = (toolTipText == null ? null
+              : (toolTipText.length() > 500 ? JvSwingUtils.wrapTooltip(
+                      true, "\"" + toolTipText.subSequence(0, 500)
+                              + "...\"") : JvSwingUtils.wrapTooltip(true,
+                      toolTipText)));
+      return toolTipText;
+    }
+  };
 
-  protected JScrollPane scrl_foundStructures = new JScrollPane(
-          tbl_summary);
+  protected JScrollPane scrl_foundStructures = new JScrollPane(tbl_summary);
 
   protected JTable tbl_local_pdb = new JTable();
 
@@ -163,6 +185,7 @@ public abstract class GStructureChooser extends JPanel implements
           PreferenceSource.STRUCTURE_CHOOSER);
 
   protected PDBDocField[] previousWantedFields;
+
   public GStructureChooser()
   {
     try
@@ -282,7 +305,6 @@ public abstract class GStructureChooser extends JPanel implements
     pnl_main.add(chk_invertFilter);
     lbl_loading.setVisible(false);
 
-
     pnl_fileChooser.add(btn_pdbFromFile);
     pnl_fileChooser.add(lbl_fromFileStatus);
     pnl_fileChooserBL.add(fileChooserAssSeqPanel, BorderLayout.NORTH);
@@ -292,7 +314,7 @@ public abstract class GStructureChooser extends JPanel implements
     pnl_idInput.add(lbl_pdbManualFetchStatus);
     pnl_idInputBL.add(idInputAssSeqPanel, BorderLayout.NORTH);
     pnl_idInputBL.add(pnl_idInput, BorderLayout.CENTER);
-    
+
     final String foundStructureSummary = MessageManager
             .getString("label.found_structures_summary");
     final String configureCols = MessageManager
@@ -303,11 +325,11 @@ public abstract class GStructureChooser extends JPanel implements
       {
         JTabbedPane sourceTabbedPane = (JTabbedPane) changeEvent
                 .getSource();
-        btn_view.setEnabled(false);
         int index = sourceTabbedPane.getSelectedIndex();
-        if (sourceTabbedPane.getTitleAt(index)
-.equals(configureCols))
+        if (sourceTabbedPane.getTitleAt(index).equals(configureCols))
         {
+          btn_view.setEnabled(false);
+          btn_cancel.setEnabled(false);
           previousWantedFields = PDBDocFieldPreferences
                   .getStructureSummaryFields().toArray(
                           new PDBRestClient.PDBDocField[0]);
@@ -315,6 +337,7 @@ public abstract class GStructureChooser extends JPanel implements
         if (sourceTabbedPane.getTitleAt(index)
                 .equals(foundStructureSummary))
         {
+          btn_cancel.setEnabled(true);
           if (wantedFieldsUpdated())
           {
             tabRefresh();
@@ -330,14 +353,14 @@ public abstract class GStructureChooser extends JPanel implements
     pnl_filter.setPreferredSize(new Dimension(500, 300));
     pnl_filter.add(foundStructureSummary, scrl_foundStructures);
     pnl_filter.add(configureCols, pdbDocFieldPrefs);
-    
+
     pnl_locPDB.add(scrl_localPDB);
 
     pnl_switchableViews.add(pnl_fileChooserBL, VIEWS_FROM_FILE);
     pnl_switchableViews.add(pnl_idInputBL, VIEWS_ENTER_ID);
     pnl_switchableViews.add(pnl_filter, VIEWS_FILTER);
     pnl_switchableViews.add(pnl_locPDB, VIEWS_LOCAL_PDB);
-    
+
     this.setLayout(mainLayout);
     this.add(pnl_main, java.awt.BorderLayout.NORTH);
     this.add(pnl_switchableViews, java.awt.BorderLayout.CENTER);
@@ -361,7 +384,7 @@ public abstract class GStructureChooser extends JPanel implements
             previousWantedFields) ? false : true;
 
   }
-  
+
   @Override
   /**
    * Event listener for the 'filter' combo-box and 'invert' check-box
@@ -438,6 +461,7 @@ public abstract class GStructureChooser extends JPanel implements
   public class AssociateSeqOptions
   {
     private SequenceI sequence;
+
     private String name;
 
     public AssociateSeqOptions(SequenceI seq)