git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-1645 source formatting and organise imports
[jalview.git]
/
src
/
jalview
/
jbgui
/
GPDBSearchPanel.java
diff --git
a/src/jalview/jbgui/GPDBSearchPanel.java
b/src/jalview/jbgui/GPDBSearchPanel.java
index
f133a61
..
64095d0
100644
(file)
--- a/
src/jalview/jbgui/GPDBSearchPanel.java
+++ b/
src/jalview/jbgui/GPDBSearchPanel.java
@@
-72,11
+72,11
@@
public abstract class GPDBSearchPanel extends JPanel
protected JButton btn_ok = new JButton();
protected JButton btn_back = new JButton();
protected JButton btn_ok = new JButton();
protected JButton btn_back = new JButton();
-
+
protected JButton btn_cancel = new JButton();
protected JButton btn_cancel = new JButton();
-
+
protected JTextField txt_search = new JTextField(20);
protected JTextField txt_search = new JTextField(20);
-
+
protected JTable tbl_summary = new JTable()
{
public String getToolTipText(MouseEvent evt)
protected JTable tbl_summary = new JTable()
{
public String getToolTipText(MouseEvent evt)
@@
-95,10
+95,8
@@
public abstract class GPDBSearchPanel extends JPanel
}
toolTipText = (toolTipText == null ? null
: (toolTipText.length() > 500 ? JvSwingUtils.wrapTooltip(
}
toolTipText = (toolTipText == null ? null
: (toolTipText.length() > 500 ? JvSwingUtils.wrapTooltip(
- true, toolTipText.subSequence(0, 500)
- + "...")
- : JvSwingUtils.wrapTooltip(true,
- toolTipText)));
+ true, toolTipText.subSequence(0, 500) + "...")
+ : JvSwingUtils.wrapTooltip(true, toolTipText)));
return toolTipText;
}
return toolTipText;
}
@@
-106,14
+104,18
@@
public abstract class GPDBSearchPanel extends JPanel
protected StringBuilder errorWarning = new StringBuilder();
protected StringBuilder errorWarning = new StringBuilder();
- protected JScrollPane scrl_searchResult = new JScrollPane(
-tbl_summary);
+ protected JScrollPane scrl_searchResult = new JScrollPane(tbl_summary);
protected ImageIcon warningImage = new ImageIcon(getClass().getResource(
"/images/warning.gif"));
protected ImageIcon warningImage = new ImageIcon(getClass().getResource(
"/images/warning.gif"));
+ protected ImageIcon loadingImage = new ImageIcon(getClass().getResource(
+ "/images/loading.gif"));
+
protected JLabel lbl_warning = new JLabel(warningImage);
protected JLabel lbl_warning = new JLabel(warningImage);
+ protected JLabel lbl_loading = new JLabel(loadingImage);
+
private JTabbedPane tabbedPane = new JTabbedPane();
private PDBDocFieldPreferences pdbDocFieldPrefs = new PDBDocFieldPreferences(
private JTabbedPane tabbedPane = new JTabbedPane();
private PDBDocFieldPreferences pdbDocFieldPrefs = new PDBDocFieldPreferences(
@@
-151,6
+153,8
@@
tbl_summary);
{
lbl_warning.setVisible(false);
lbl_warning.setFont(new java.awt.Font("Verdana", 0, 12));
{
lbl_warning.setVisible(false);
lbl_warning.setFont(new java.awt.Font("Verdana", 0, 12));
+ lbl_loading.setVisible(false);
+ lbl_loading.setFont(new java.awt.Font("Verdana", 0, 12));
tbl_summary.setAutoCreateRowSorter(true);
tbl_summary.getTableHeader().setReorderingAllowed(false);
tbl_summary.setAutoCreateRowSorter(true);
tbl_summary.getTableHeader().setReorderingAllowed(false);
@@
-160,6
+164,7
@@
tbl_summary);
{
validateSelection();
}
{
validateSelection();
}
+
public void mouseReleased(MouseEvent e)
{
validateSelection();
public void mouseReleased(MouseEvent e)
{
validateSelection();
@@
-196,7
+201,6
@@
tbl_summary);
}
});
}
});
-
scrl_searchResult.setPreferredSize(new Dimension(500, 300));
scrl_searchResult
.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
scrl_searchResult.setPreferredSize(new Dimension(500, 300));
scrl_searchResult
.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
@@
-222,8
+226,9
@@
tbl_summary);
else
{
tooltipText = MessageManager.formatMessage(
else
{
tooltipText = MessageManager.formatMessage(
- "label.separate_multiple_query_values", new Object[]
- { getCmbSearchTarget().getSelectedItem().toString() });
+ "label.separate_multiple_query_values",
+ new Object[] { getCmbSearchTarget().getSelectedItem()
+ .toString() });
}
txt_search.setToolTipText(JvSwingUtils.wrapTooltip(true,
tooltipText));
}
txt_search.setToolTipText(JvSwingUtils.wrapTooltip(true,
tooltipText));
@@
-233,7
+238,6
@@
tbl_summary);
populateCmbSearchTargetOptions();
populateCmbSearchTargetOptions();
-
txt_search.setFont(new java.awt.Font("Verdana", 0, 12));
txt_search.addKeyListener(new KeyAdapter()
txt_search.setFont(new java.awt.Font("Verdana", 0, 12));
txt_search.addKeyListener(new KeyAdapter()
@@
-280,7
+284,8
@@
tbl_summary);
final String searchTabTitle = MessageManager
.getString("label.search_result");
final String searchTabTitle = MessageManager
.getString("label.search_result");
- final String configureCols = MessageManager.getString("label.configure_displayed_columns");
+ final String configureCols = MessageManager
+ .getString("label.configure_displayed_columns");
ChangeListener changeListener = new ChangeListener()
{
public void stateChanged(ChangeEvent changeEvent)
ChangeListener changeListener = new ChangeListener()
{
public void stateChanged(ChangeEvent changeEvent)
@@
-323,6
+328,7
@@
tbl_summary);
pnl_results.add(tabbedPane);
pnl_inputs.add(cmb_searchTarget);
pnl_inputs.add(txt_search);
pnl_results.add(tabbedPane);
pnl_inputs.add(cmb_searchTarget);
pnl_inputs.add(txt_search);
+ pnl_inputs.add(lbl_loading);
pnl_inputs.add(lbl_warning);
this.setLayout(mainLayout);
pnl_inputs.add(lbl_warning);
this.setLayout(mainLayout);
@@
-347,6
+353,7
@@
tbl_summary);
: true;
}
: true;
}
+
public void validateSelection()
{
if (tbl_summary.getSelectedRows().length > 0)
public void validateSelection()
{
if (tbl_summary.getSelectedRows().length > 0)
@@
-358,6
+365,7
@@
tbl_summary);
btn_ok.setEnabled(false);
}
}
btn_ok.setEnabled(false);
}
}
+
public JComboBox<PDBDocField> getCmbSearchTarget()
{
return cmb_searchTarget;
public JComboBox<PDBDocField> getCmbSearchTarget()
{
return cmb_searchTarget;