git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 195951e)
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Tue, 18 Aug 2015 10:47:46 +0000 (11:47 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Tue, 18 Aug 2015 10:47:46 +0000 (11:47 +0100)
resources/lang/Messages.properties patch | blob | history
src/jalview/gui/JvSwingUtils.java patch | blob | history
src/jalview/gui/PDBSearchPanel.java patch | blob | history
src/jalview/jbgui/GPDBSearchPanel.java patch | blob | history
src/jalview/jbgui/GStructureChooser.java patch | blob | history

diff --git a/resources/lang/Messages.properties b/resources/lang/Messages.properties
index f5e07be..59562aa 100644 (file)
--- a/resources/lang/Messages.properties
+++ b/resources/lang/Messages.properties
@@ -772,7 +772,7 @@ label.transformed_points_for_params = Transformed points for {0}
 label.graduated_color_for_params = Graduated Feature Colour for {0}
 label.select_backgroud_colour = Select Background Colour
 label.invalid_font = Invalid Font
-label.separate_multiple_accession_ids = Enter one or more accession IDs
+label.separate_multiple_accession_ids = Enter one or more PDB accession IDs separated by a semi-colon ";"
 label.separate_multiple_query_values = Enter one or more {0}s separated by a semi-colon ";"
 label.search_all = Enter one or more search values separated by a semi-colon ";" (Note: This Searches the entire PDB database)
 label.replace_commas_semicolons = Replace commas with semi-colons
diff --git a/src/jalview/gui/JvSwingUtils.java b/src/jalview/gui/JvSwingUtils.java
index b6f85b3..a9d0e75 100644 (file)
--- a/src/jalview/gui/JvSwingUtils.java
+++ b/src/jalview/gui/JvSwingUtils.java
@@ -20,12 +20,15 @@
  */
 package jalview.gui;
 
+import jalview.util.MessageManager;
+
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Font;
 import java.awt.GridLayout;
 import java.awt.Rectangle;
 import java.awt.event.ActionListener;
+import java.util.Objects;
 
 import javax.swing.AbstractButton;
 import javax.swing.JButton;
@@ -37,8 +40,6 @@ import javax.swing.JPanel;
 import javax.swing.JScrollBar;
 import javax.swing.SwingConstants;
 
-import jalview.util.MessageManager;
-
 /**
  * useful functions for building Swing GUIs
  * 
@@ -59,6 +60,7 @@ public final class JvSwingUtils
    */
   public static String wrapTooltip(boolean enclose, String ttext)
   {
+    Objects.requireNonNull(ttext, "Tootip text to format must not be null!");
     ttext = ttext.trim();
     boolean maxLenghtExceeded = false;
 
@@ -85,9 +87,9 @@ public final class JvSwingUtils
     }
     else
     {
-      return (enclose ? "<html><table width=350 border=0><tr><td align=justify>"
-              : "")
-              + ttext + ((enclose ? "</td></tr></table></html>" : ""));
+      return enclose ? "<html><style> p.ttip {width: 350; text-align: justify; word-wrap: break-word;}</style><p class=\"ttip\">"
+              + ttext + "</p></html>"
+              : ttext;
     }
   }
 
@@ -148,12 +150,8 @@ public final class JvSwingUtils
     JPanel laypanel = new JPanel(new GridLayout(1, 2));
     JPanel labPanel = new JPanel(new BorderLayout());
     JPanel valPanel = new JPanel();
-    // laypanel.setSize(panel.getPreferredSize());
-    // laypanel.setLayout(null);
     labPanel.setBounds(new Rectangle(7, 7, 158, 23));
     valPanel.setBounds(new Rectangle(172, 7, 270, 23));
-    // labPanel.setLayout(new GridLayout(1,1));
-    // valPanel.setLayout(new GridLayout(1,1));
     labPanel.add(label, BorderLayout.WEST);
     valPanel.add(valBox);
     laypanel.add(labPanel);
diff --git a/src/jalview/gui/PDBSearchPanel.java b/src/jalview/gui/PDBSearchPanel.java
index 06aa5df..63c3761 100644 (file)
--- a/src/jalview/gui/PDBSearchPanel.java
+++ b/src/jalview/gui/PDBSearchPanel.java
@@ -96,8 +96,6 @@ public class PDBSearchPanel extends GPDBSearchPanel
       } catch (Exception e)
       {
         // System.out.println(">>>>>>>>>>>>>>>" + e.getMessage());
-        // JOptionPane.showMessageDialog(this, e.getMessage(),
-        // "PDB Web-service Error", JOptionPane.ERROR_MESSAGE);
         e.printStackTrace();
         errorWarning.append(e.getMessage());
         checkForErrors();
diff --git a/src/jalview/jbgui/GPDBSearchPanel.java b/src/jalview/jbgui/GPDBSearchPanel.java
index b0bb5bd..08a620a 100644 (file)
--- a/src/jalview/jbgui/GPDBSearchPanel.java
+++ b/src/jalview/jbgui/GPDBSearchPanel.java
@@ -77,7 +77,27 @@ public abstract class GPDBSearchPanel extends JPanel
   
   protected JTextField txt_search = new JTextField(20);
   
-  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 : JvSwingUtils.wrapTooltip(
+              true, toolTipText));
+      return toolTipText;
+    }
+  };
 
   protected StringBuilder errorWarning = new StringBuilder();
 
@@ -128,6 +148,7 @@ tbl_summary);
     lbl_warning.setFont(new java.awt.Font("Verdana", 0, 12));
 
     tbl_summary.setAutoCreateRowSorter(true);
+    tbl_summary.getTableHeader().setReorderingAllowed(false);
     tbl_summary.addMouseListener(new MouseAdapter()
     {
       public void mouseClicked(MouseEvent e)
diff --git a/src/jalview/jbgui/GStructureChooser.java b/src/jalview/jbgui/GStructureChooser.java
index 8596081..9e4e6f3 100644 (file)
--- 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;
@@ -148,7 +149,27 @@ 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 : JvSwingUtils.wrapTooltip(
+              true, toolTipText));
+      return toolTipText;
+    }
+  };
 
   protected JScrollPane scrl_foundStructures = new JScrollPane(
           tbl_summary);