/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
package jalview.jbgui;
-import jalview.datamodel.SequenceI;
-import jalview.fts.api.FTSDataColumnI;
-import jalview.fts.core.FTSDataColumnPreferences;
-import jalview.fts.core.FTSDataColumnPreferences.PreferenceSource;
-import jalview.fts.service.pdb.PDBFTSRestClient;
-import jalview.gui.AlignmentPanel;
-import jalview.gui.Desktop;
-import jalview.gui.JvSwingUtils;
-import jalview.gui.StructureViewer;
-import jalview.util.MessageManager;
-
import java.awt.BorderLayout;
import java.awt.CardLayout;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
import java.awt.GridLayout;
+import java.awt.Insets;
+import java.awt.Point;
import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.awt.event.KeyAdapter;
import javax.swing.JCheckBox;
import javax.swing.JComboBox;
import javax.swing.JFrame;
-import javax.swing.JInternalFrame;
+import jalview.gui.JalviewInternalFrame;
import javax.swing.JLabel;
import javax.swing.JList;
import javax.swing.JPanel;
import javax.swing.JTable;
import javax.swing.JTextField;
import javax.swing.ListCellRenderer;
+import javax.swing.SwingConstants;
+import javax.swing.Timer;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.event.DocumentEvent;
import javax.swing.event.InternalFrameEvent;
import javax.swing.table.TableColumn;
+import jalview.datamodel.SequenceI;
+import jalview.fts.api.FTSDataColumnI;
+import jalview.fts.core.FTSDataColumnPreferences;
+import jalview.gui.AlignmentPanel;
+import jalview.gui.Desktop;
+import jalview.gui.JvSwingUtils;
+import jalview.gui.StructureViewer;
+import jalview.structure.StructureImportSettings;
+import jalview.structure.StructureImportSettings.TFType;
+import jalview.util.MessageManager;
+import jalview.util.Platform;
import net.miginfocom.swing.MigLayout;
@SuppressWarnings("serial")
public abstract class GStructureChooser extends JPanel
implements ItemListener
{
+ private static final Font VERDANA_12 = new Font("Verdana", 0, 12);
+
+ private static final Font VERDANA_10 = new Font("Verdana", 0, 10);
+
+ public static final String VIEWS_FILTER = "VIEWS_FILTER";
+
+ protected static final String VIEWS_FROM_FILE = "VIEWS_FROM_FILE";
+
+ protected static final String VIEWS_ENTER_ID = "VIEWS_ENTER_ID";
+
+ /*
+ * 'cached' structure view
+ */
+ protected static final String VIEWS_LOCAL_PDB = "VIEWS_LOCAL_PDB";
+
+ protected JPanel actionsPanel;
+
protected JPanel statusPanel = new JPanel();
public JLabel statusBar = new JLabel();
- private JPanel pnl_actionsAndStatus = new JPanel(new BorderLayout());
-
protected String frameTitle = MessageManager
.getString("label.structure_chooser");
- protected JInternalFrame mainFrame = new JInternalFrame(frameTitle);
+ protected JalviewInternalFrame mainFrame = new JalviewInternalFrame(frameTitle);
protected JComboBox<FilterOption> cmb_filterOption = new JComboBox<>();
protected StringBuilder errorWarning = new StringBuilder();
- protected JLabel lbl_result = new JLabel(
- MessageManager.getString("label.select"));
+ protected JButton btn_cancel;
- protected JButton btn_view = new JButton();
+ protected JButton btn_add;
- protected JButton btn_cancel = new JButton();
+ protected JButton btn_newView;
protected JButton btn_pdbFromFile = new JButton();
- protected JTextField txt_search = new JTextField(14);
+ protected JLabel lbl_pdbFile = new JLabel();
- private JPanel pnl_actions = new JPanel(new MigLayout());
+ protected JLabel lbl_chooseTempFacType = new JLabel();
- private JPanel pnl_main = new JPanel();
+ protected JComboBox<StructureImportSettings.TFType> combo_tempFacAs = new JComboBox<>();
- private JPanel pnl_idInput = new JPanel(new FlowLayout());
+ protected boolean tempFacAsChanged = false;
- private JPanel pnl_fileChooser = new JPanel(new FlowLayout());
+ protected JButton btn_paeMatrixFile = new JButton();
- private JPanel pnl_idInputBL = new JPanel(new BorderLayout());
+ protected JLabel lbl_paeFile = new JLabel();
- private JPanel pnl_fileChooserBL = new JPanel(new BorderLayout());
+ // holder for icon and button
+ protected JPanel pnl_queryTDB;
- private JPanel pnl_locPDB = new JPanel(new BorderLayout());
+ protected JButton btn_queryTDB = new JButton();
+
+ protected JCheckBox chk_superpose = new JCheckBox(
+ MessageManager.getString("label.superpose_structures"));
+
+ protected JTextField txt_search = new JTextField(14);
protected JPanel pnl_switchableViews = new JPanel(new CardLayout());
protected CardLayout layout_switchableViews = (CardLayout) (pnl_switchableViews
.getLayout());
- private BorderLayout mainLayout = new BorderLayout();
-
- protected JCheckBox chk_rememberSettings = new JCheckBox(
- MessageManager.getString("label.dont_ask_me_again"));
-
protected JCheckBox chk_invertFilter = new JCheckBox(
MessageManager.getString("label.invert"));
protected ImageIcon warningImage = new ImageIcon(
getClass().getResource("/images/warning.gif"));
- protected JLabel lbl_warning = new JLabel(warningImage);
+ protected ImageIcon tdbImage = new ImageIcon(getClass()
+ .getResource("/images/3d-beacons-logo-transparent.png"));
protected JLabel lbl_loading = new JLabel(loadingImage);
protected JLabel lbl_pdbManualFetchStatus = new JLabel(errorImage);
- protected JLabel lbl_fromFileStatus = new JLabel(errorImage);
-
- protected AssciateSeqPanel idInputAssSeqPanel = new AssciateSeqPanel();
-
- protected AssciateSeqPanel fileChooserAssSeqPanel = new AssciateSeqPanel();
-
- protected static final String VIEWS_FILTER = "VIEWS_FILTER";
-
- protected static final String VIEWS_FROM_FILE = "VIEWS_FROM_FILE";
+ // protected JLabel lbl_fromFileStatus = new JLabel(errorImage);
- protected static final String VIEWS_ENTER_ID = "VIEWS_ENTER_ID";
+ protected AssociateSeqPanel idInputAssSeqPanel = new AssociateSeqPanel();
- protected JComboBox<StructureViewer> targetView = new JComboBox();
+ protected AssociateSeqPanel fileChooserAssSeqPanel = new AssociateSeqPanel();
- /**
- * 'cached' structure view
- */
- protected static final String VIEWS_LOCAL_PDB = "VIEWS_LOCAL_PDB";
+ protected JComboBox<StructureViewer> targetView = new JComboBox<>();
protected JTable tbl_local_pdb = new JTable();
- protected JScrollPane scrl_localPDB = new JScrollPane(tbl_local_pdb);
-
protected JTabbedPane pnl_filter = new JTabbedPane();
- protected FTSDataColumnPreferences pdbDocFieldPrefs = new FTSDataColumnPreferences(
- PreferenceSource.STRUCTURE_CHOOSER,
- PDBFTSRestClient.getInstance());
+ protected abstract FTSDataColumnPreferences getFTSDocFieldPrefs();
+
+ protected abstract void setFTSDocFieldPrefs(
+ FTSDataColumnPreferences newPrefs);
protected FTSDataColumnI[] previousWantedFields;
}
};
- protected JScrollPane scrl_foundStructures = new JScrollPane(tbl_summary);
-
public GStructureChooser()
{
+ }
+
+ protected void initDialog()
+ {
+
try
{
jbInit();
+ mainFrame.setFrameIcon(null);
mainFrame.setVisible(false);
mainFrame.invalidate();
mainFrame.pack();
} catch (Exception e)
{
+ System.out.println(e); // for JavaScript TypeError
e.printStackTrace();
}
}
+ // BH SwingJS optimization
+ // (a) 100-ms interruptable timer for text entry -- BH 1/10/2019
+ // (b) two-character minimum, at least for JavaScript.
+
+ private Timer timer;
+
+ protected void txt_search_ActionPerformedDelayed()
+ {
+ if (timer != null)
+ {
+ timer.stop();
+ }
+ timer = new Timer(300, new ActionListener()
+ {
+
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ txt_search_ActionPerformed();
+ }
+ });
+ timer.setRepeats(false);
+ timer.start();
+ }
+ //
+
/**
* Initializes the GUI default properties
*
tbl_summary.addMouseListener(new MouseAdapter()
{
@Override
+ public void mousePressed(MouseEvent e)
+ {
+ if (!popupAction(e))
+ {
+ super.mousePressed(e);
+ }
+ }
+
+ @Override
public void mouseClicked(MouseEvent e)
{
- validateSelections();
+ if (!popupAction(e))
+ {
+ validateSelections();
+ }
}
@Override
public void mouseReleased(MouseEvent e)
{
- validateSelections();
+ if (!popupAction(e))
+ {
+ validateSelections();
+ }
+ }
+
+ boolean popupAction(MouseEvent e)
+ {
+ if (e.isPopupTrigger())
+ {
+ Point pt = e.getPoint();
+ int selectedRow = tbl_summary.rowAtPoint(pt);
+ if (showPopupFor(selectedRow, pt.x, pt.y))
+ {
+ return true;
+ }
+ }
+ return false;
}
});
tbl_summary.addKeyListener(new KeyAdapter()
mainFrame.dispose();
break;
case KeyEvent.VK_ENTER: // enter key
- if (btn_view.isEnabled())
+ if (btn_add.isEnabled())
{
- ok_ActionPerformed();
+ add_ActionPerformed();
}
break;
case KeyEvent.VK_TAB: // tab key
}
else
{
- btn_view.requestFocus();
+ btn_add.requestFocus();
}
evt.consume();
break;
}
}
});
+
+ btn_cancel = new JButton(MessageManager.getString("action.cancel"));
+ btn_cancel.setFont(VERDANA_12);
+ btn_cancel.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ closeAction(pnl_filter.getHeight());
+ }
+ });
+ btn_cancel.addKeyListener(new KeyAdapter()
+ {
+ @Override
+ public void keyPressed(KeyEvent evt)
+ {
+ if (evt.getKeyCode() == KeyEvent.VK_ENTER)
+ {
+ closeAction(pnl_filter.getHeight());
+ }
+ }
+ });
+
tbl_local_pdb.setAutoCreateRowSorter(true);
tbl_local_pdb.getTableHeader().setReorderingAllowed(false);
tbl_local_pdb.addMouseListener(new MouseAdapter()
mainFrame.dispose();
break;
case KeyEvent.VK_ENTER: // enter key
- if (btn_view.isEnabled())
+ if (btn_add.isEnabled())
{
- ok_ActionPerformed();
+ add_ActionPerformed();
}
break;
case KeyEvent.VK_TAB: // tab key
}
else
{
- if (btn_view.isEnabled())
+ if (btn_add.isEnabled())
{
- btn_view.requestFocus();
+ btn_add.requestFocus();
}
else
{
}
}
});
- btn_view.setFont(new java.awt.Font("Verdana", 0, 12));
- btn_view.setText(MessageManager.getString("action.view"));
- btn_view.addActionListener(new java.awt.event.ActionListener()
+
+ btn_newView = new JButton(
+ MessageManager.formatMessage("action.new_structure_view_with",
+ StructureViewer.getViewerType().toString()));
+ btn_newView.setFont(VERDANA_12);
+ btn_newView.addActionListener(new ActionListener()
{
@Override
public void actionPerformed(ActionEvent e)
{
- ok_ActionPerformed();
+ newView_ActionPerformed();
}
});
- btn_view.addKeyListener(new KeyAdapter()
+ btn_newView.addKeyListener(new KeyAdapter()
{
@Override
public void keyPressed(KeyEvent evt)
{
if (evt.getKeyCode() == KeyEvent.VK_ENTER)
{
- ok_ActionPerformed();
+ newView_ActionPerformed();
}
}
});
- btn_cancel.setFont(new java.awt.Font("Verdana", 0, 12));
- btn_cancel.setText(MessageManager.getString("action.cancel"));
- btn_cancel.addActionListener(new java.awt.event.ActionListener()
+ // TODO: JAL-3898 - get list of available external programs to view
+ // structures with
+
+ btn_add = new JButton(MessageManager.getString("action.add"));
+ btn_add.setFont(VERDANA_12);
+ btn_add.addActionListener(new ActionListener()
{
@Override
public void actionPerformed(ActionEvent e)
{
- closeAction(pnl_filter.getHeight());
+ add_ActionPerformed();
}
});
- btn_cancel.addKeyListener(new KeyAdapter()
+ btn_add.addKeyListener(new KeyAdapter()
{
@Override
public void keyPressed(KeyEvent evt)
{
if (evt.getKeyCode() == KeyEvent.VK_ENTER)
{
- closeAction(pnl_filter.getHeight());
+ add_ActionPerformed();
}
}
});
- btn_pdbFromFile.setFont(new java.awt.Font("Verdana", 0, 12));
+ btn_pdbFromFile.setFont(VERDANA_12);
String btn_title = MessageManager.getString("label.select_pdb_file");
btn_pdbFromFile.setText(btn_title + " ");
- btn_pdbFromFile.addActionListener(new java.awt.event.ActionListener()
+ btn_pdbFromFile.addActionListener(new ActionListener()
{
@Override
public void actionPerformed(ActionEvent e)
}
}
});
+ lbl_pdbFile.setFont(VERDANA_10);
+ lbl_pdbFile.setFont(VERDANA_10);
+
+ lbl_chooseTempFacType.setFont(VERDANA_12);
+ lbl_chooseTempFacType.setText(
+ MessageManager.getString("label.interpret_tempfac_as"));
+
+ combo_tempFacAs.setFont(VERDANA_12);
+ for (TFType t : TFType.values())
+ {
+ combo_tempFacAs.addItem(t);
+ }
+ combo_tempFacAs.addItemListener(new ItemListener()
+ {
+ @Override
+ public void itemStateChanged(ItemEvent e)
+ {
+ // used to determine if we should guess pLDDT or leave a user-choice
+ tempFacAsChanged = true;
+ }
+ });
+
+ btn_paeMatrixFile.setFont(VERDANA_12);
+ btn_paeMatrixFile
+ .setText(MessageManager.getString("label.add_pae_matrix_file"));
+ btn_paeMatrixFile.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ paeMatrixFile_actionPerformed();
+ }
+ });
+ btn_paeMatrixFile.addKeyListener(new KeyAdapter()
+ {
+ @Override
+ public void keyPressed(KeyEvent evt)
+ {
+ if (evt.getKeyCode() == KeyEvent.VK_ENTER)
+ {
+ paeMatrixFile_actionPerformed();
+ }
+ }
+ });
+ lbl_paeFile.setFont(VERDANA_10);
+ JScrollPane scrl_foundStructures = new JScrollPane(tbl_summary);
scrl_foundStructures.setPreferredSize(new Dimension(width, height));
+ JScrollPane scrl_localPDB = new JScrollPane(tbl_local_pdb);
scrl_localPDB.setPreferredSize(new Dimension(width, height));
scrl_localPDB.setHorizontalScrollBarPolicy(
JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
- cmb_filterOption.setFont(new java.awt.Font("Verdana", 0, 12));
- chk_invertFilter.setFont(new java.awt.Font("Verdana", 0, 12));
- chk_rememberSettings.setFont(new java.awt.Font("Verdana", 0, 12));
- chk_rememberSettings.setVisible(false);
+ chk_invertFilter.setFont(VERDANA_12);
txt_search.setToolTipText(JvSwingUtils.wrapTooltip(true,
MessageManager.getString("label.enter_pdb_id_tip")));
- cmb_filterOption.setToolTipText(
- MessageManager.getString("info.select_filter_option"));
txt_search.getDocument().addDocumentListener(new DocumentListener()
{
@Override
public void insertUpdate(DocumentEvent e)
{
- txt_search_ActionPerformed();
+ txt_search_ActionPerformedDelayed();
}
@Override
public void removeUpdate(DocumentEvent e)
{
- txt_search_ActionPerformed();
+ txt_search_ActionPerformedDelayed();
}
@Override
public void changedUpdate(DocumentEvent e)
{
- txt_search_ActionPerformed();
+ txt_search_ActionPerformedDelayed();
}
});
+ cmb_filterOption.setFont(VERDANA_12);
+ cmb_filterOption.setToolTipText(
+ MessageManager.getString("info.select_filter_option"));
cmb_filterOption.addItemListener(this);
-
// add CustomComboSeparatorsRenderer to filter option combo-box
cmb_filterOption.setRenderer(new CustomComboSeparatorsRenderer(
(ListCellRenderer<Object>) cmb_filterOption.getRenderer())
});
chk_invertFilter.addItemListener(this);
+ btn_queryTDB = new JButton();
+ if (Platform.isMac())
+ {
+ // needed to make icon button have round corners in vaqua
+ btn_queryTDB.putClientProperty("JButton.buttonType", "bevel");
+ }
+ btn_queryTDB.setMargin(new Insets(0, 16, 0, 20));
+ btn_queryTDB
+ .setText(MessageManager.getString("label.search_3dbeacons"));
+ btn_queryTDB.setIconTextGap(12);
+ btn_queryTDB.setIcon(tdbImage);
+ btn_queryTDB.setVerticalTextPosition(SwingConstants.CENTER);
+ btn_queryTDB.setHorizontalTextPosition(SwingConstants.TRAILING);
+ btn_queryTDB.setFont(VERDANA_12);
+ btn_queryTDB.setToolTipText(
+ MessageManager.getString("label.find_models_from_3dbeacons"));
+ // btn_queryTDB.setPreferredSize(new Dimension(200, 32));
+ btn_queryTDB.setVisible(false);
targetView.setVisible(false);
- pnl_actions.add(targetView,"wrap");
- pnl_actions.add(chk_rememberSettings);
- pnl_actions.add(btn_view);
- pnl_actions.add(btn_cancel);
-
- // pnl_filter.add(lbl_result);
- pnl_main.add(cmb_filterOption);
- pnl_main.add(lbl_loading);
- 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);
- pnl_fileChooserBL.add(pnl_fileChooser, BorderLayout.CENTER);
+ actionsPanel = new JPanel(new MigLayout());
+ actionsPanel.add(targetView, "left");
+ actionsPanel.add(btn_add, "wrap");
+ actionsPanel.add(chk_superpose, "left");
+ actionsPanel.add(btn_newView);
+ actionsPanel.add(btn_cancel, "right");
+
+ JPanel pnl_main = new JPanel(new BorderLayout());
+ JPanel pnl_controls = new JPanel();
+ pnl_queryTDB = new JPanel();
+ pnl_queryTDB.setLayout(new FlowLayout(FlowLayout.CENTER, 4, 4));
+ pnl_queryTDB.setBackground(getBackground());
+ pnl_queryTDB.add(btn_queryTDB);
+
+ pnl_queryTDB.setVisible(false);
+ pnl_main.add(pnl_queryTDB, BorderLayout.NORTH);
+ pnl_controls.add(cmb_filterOption);
+ pnl_controls.add(lbl_loading);
+ pnl_controls.add(chk_invertFilter);
+ pnl_main.add(pnl_controls, BorderLayout.CENTER);
+ lbl_loading.setVisible(false);
+ // JPanel pnl_fileChooser = new JPanel(new FlowLayout());
+ // pnl_fileChooser.add(btn_pdbFromFile);
+ // pnl_fileChooser.add(lbl_fromFileStatus);
+
+ JPanel pnl_fileOptions = new JPanel();
+ pnl_fileOptions.setLayout(new GridBagLayout());
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.weightx = 0.0;
+ gbc.weighty = 0.0;
+ gbc.insets = new Insets(0, 0, 2, 0);
+ gbc.fill = GridBagConstraints.NONE;
+ gbc.anchor = GridBagConstraints.FIRST_LINE_START;
+ // pnl_fileOptions.add(pnl_fileChooser, gbc);
+ pnl_fileOptions.add(btn_pdbFromFile, gbc);
+ gbc.gridy++;
+ gbc.insets = new Insets(0, 0, 18, 0);
+ pnl_fileOptions.add(lbl_pdbFile, gbc);
+ gbc.gridy++;
+
+ gbc.insets = new Insets(0, 0, 2, 0);
+ pnl_fileOptions.add(new JLabel(
+ MessageManager.getString("label.structure_import_options")),
+ gbc);
+ gbc.gridy++;
+
+ gbc.insets = new Insets(0, 0, 6, 0);
+ pnl_fileOptions.add(lbl_chooseTempFacType, gbc);
+ gbc.gridy++;
+ gbc.insets = new Insets(0, 0, 18, 0);
+ pnl_fileOptions.add(combo_tempFacAs, gbc);
+ gbc.gridy++;
+ gbc.insets = new Insets(0, 0, 6, 0);
+ pnl_fileOptions.add(btn_paeMatrixFile, gbc);
+ gbc.gridy++;
+ gbc.insets = new Insets(0, 0, 2, 0);
+ gbc.weighty = 1.0;
+ pnl_fileOptions.add(lbl_paeFile, gbc);
+
+ JPanel pnl_fileChooserBL = new JPanel(new BorderLayout());
+ pnl_fileChooserBL.add(fileChooserAssSeqPanel, BorderLayout.PAGE_START);
+ pnl_fileChooserBL.add(pnl_fileOptions, BorderLayout.CENTER);
+
+ JPanel pnl_idInput = new JPanel(new FlowLayout());
pnl_idInput.add(txt_search);
pnl_idInput.add(lbl_pdbManualFetchStatus);
+
+ JPanel pnl_idInputBL = new JPanel(new BorderLayout());
pnl_idInputBL.add(idInputAssSeqPanel, BorderLayout.NORTH);
pnl_idInputBL.add(pnl_idInput, BorderLayout.CENTER);
JTabbedPane sourceTabbedPane = (JTabbedPane) changeEvent
.getSource();
int index = sourceTabbedPane.getSelectedIndex();
- btn_view.setVisible(true);
+ btn_add.setVisible(targetView.isVisible());
+ btn_newView.setVisible(true);
btn_cancel.setVisible(true);
if (sourceTabbedPane.getTitleAt(index).equals(configureCols))
{
- btn_view.setEnabled(false);
+ btn_add.setEnabled(false);
btn_cancel.setEnabled(false);
- btn_view.setVisible(false);
+ btn_add.setVisible(false);
+ btn_newView.setEnabled(false);
btn_cancel.setVisible(false);
- previousWantedFields = pdbDocFieldPrefs
+ previousWantedFields = getFTSDocFieldPrefs()
.getStructureSummaryFields()
.toArray(new FTSDataColumnI[0]);
}
pnl_filter.addChangeListener(changeListener);
pnl_filter.setPreferredSize(new Dimension(width, height));
pnl_filter.add(foundStructureSummary, scrl_foundStructures);
- pnl_filter.add(configureCols, pdbDocFieldPrefs);
+ pnl_filter.add(configureCols, getFTSDocFieldPrefs());
+ JPanel pnl_locPDB = new JPanel(new BorderLayout());
pnl_locPDB.add(scrl_localPDB);
pnl_switchableViews.add(pnl_fileChooserBL, VIEWS_FROM_FILE);
pnl_switchableViews.add(pnl_filter, VIEWS_FILTER);
pnl_switchableViews.add(pnl_locPDB, VIEWS_LOCAL_PDB);
- this.setLayout(mainLayout);
+ this.setLayout(new BorderLayout());
this.add(pnl_main, java.awt.BorderLayout.NORTH);
this.add(pnl_switchableViews, java.awt.BorderLayout.CENTER);
// this.add(pnl_actions, java.awt.BorderLayout.SOUTH);
statusPanel.setLayout(new GridLayout());
- pnl_actionsAndStatus.add(pnl_actions, BorderLayout.CENTER);
+
+ JPanel pnl_actionsAndStatus = new JPanel(new BorderLayout());
+ pnl_actionsAndStatus.add(actionsPanel, BorderLayout.CENTER);
pnl_actionsAndStatus.add(statusPanel, BorderLayout.SOUTH);
statusPanel.add(statusBar, null);
this.add(pnl_actionsAndStatus, java.awt.BorderLayout.SOUTH);
Desktop.addInternalFrame(mainFrame, frameTitle, width, height);
}
+ protected abstract boolean showPopupFor(int selectedRow, int x, int y);
+
protected void closeAction(int preferredHeight)
{
// System.out.println(">>>>>>>>>> closing internal frame!!!");
return true;
}
- FTSDataColumnI[] currentWantedFields = pdbDocFieldPrefs
+ FTSDataColumnI[] currentWantedFields = getFTSDocFieldPrefs()
.getStructureSummaryFields().toArray(new FTSDataColumnI[0]);
return Arrays.equals(currentWantedFields, previousWantedFields) ? false
: true;
}
/**
- * This inner class provides the data model for the structure filter combo-box
- *
- * @author tcnofoegbu
- *
- */
- public class FilterOption
- {
- private String name;
-
- private String value;
-
- private String view;
-
- private boolean addSeparatorAfter;
-
- /**
- * Model for structure filter option
- *
- * @param name
- * - the name of the Option
- * @param value
- * - the value of the option
- * @param view
- * - the category of the filter option
- * @param addSeparatorAfter
- * - if true, a horizontal separator is rendered immediately after
- * this filter option, otherwise
- */
- public FilterOption(String name, String value, String view,
- boolean addSeparatorAfter)
- {
- this.name = name;
- this.value = value;
- this.view = view;
- this.addSeparatorAfter = addSeparatorAfter;
- }
-
- public String getName()
- {
- return name;
- }
-
- public void setName(String name)
- {
- this.name = name;
- }
-
- public String getValue()
- {
- return value;
- }
-
- public void setValue(String value)
- {
- this.value = value;
- }
-
- public String getView()
- {
- return view;
- }
-
- public void setView(String view)
- {
- this.view = view;
- }
-
- @Override
- public String toString()
- {
- return this.name;
- }
-
- public boolean isAddSeparatorAfter()
- {
- return addSeparatorAfter;
- }
-
- public void setAddSeparatorAfter(boolean addSeparatorAfter)
- {
- this.addSeparatorAfter = addSeparatorAfter;
- }
- }
-
- /**
* This inner class provides the provides the data model for associate
* sequence combo-box - cmb_assSeq
*
* @author tcnofoegbu
*
*/
- public class AssciateSeqPanel extends JPanel implements ItemListener
+ public class AssociateSeqPanel extends JPanel implements ItemListener
{
private JComboBox<AssociateSeqOptions> cmb_assSeq = new JComboBox<>();
private JLabel lbl_associateSeq = new JLabel();
- public AssciateSeqPanel()
+ public AssociateSeqPanel()
{
this.setLayout(new FlowLayout());
this.add(cmb_assSeq);
protected abstract void stateChanged(ItemEvent e);
- protected abstract void ok_ActionPerformed();
+ protected abstract void add_ActionPerformed();
+
+ protected abstract void newView_ActionPerformed();
protected abstract void pdbFromFile_actionPerformed();
+ protected abstract void paeMatrixFile_actionPerformed();
+
protected abstract void txt_search_ActionPerformed();
- public abstract void populateCmbAssociateSeqOptions(
+ protected abstract void populateCmbAssociateSeqOptions(
JComboBox<AssociateSeqOptions> cmb_assSeq,
JLabel lbl_associateSeq);
- public abstract void cmbAssSeqStateChanged();
+ protected abstract void cmbAssSeqStateChanged();
- public abstract void tabRefresh();
+ protected abstract void tabRefresh();
- public abstract void validateSelections();
-}
\ No newline at end of file
+ protected abstract void validateSelections();
+
+ public JalviewInternalFrame getFrame()
+ {
+ return mainFrame;
+ }
+
+ public void setPdbOptionsEnabled(boolean b)
+ {
+ lbl_chooseTempFacType.setEnabled(b);
+ combo_tempFacAs.setEnabled(b);
+ btn_paeMatrixFile.setEnabled(b);
+ lbl_paeFile.setEnabled(b);
+ }
+}