X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGStructureChooser.java;h=c4043c49539d80c6d1b6dd5993b1d47ca759d07e;hb=6f2610ec4d7a79dde17f9b3d02225c62aa52cfd8;hp=2c51b3d2b7651eb498015ee42ad349bf455c70e4;hpb=19dae30f7acd7a93c432909db03a3373ded74e20;p=jalview.git diff --git a/src/jalview/jbgui/GStructureChooser.java b/src/jalview/jbgui/GStructureChooser.java index 2c51b3d..c4043c4 100644 --- a/src/jalview/jbgui/GStructureChooser.java +++ b/src/jalview/jbgui/GStructureChooser.java @@ -75,7 +75,7 @@ public abstract class GStructureChooser extends JPanel implements protected JComboBox cmb_filterOption = new JComboBox(); protected AlignmentPanel ap; - + protected StringBuilder errorWarning = new StringBuilder(); protected JLabel lbl_result = new JLabel( @@ -136,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(); @@ -174,8 +173,7 @@ public abstract class GStructureChooser extends JPanel implements } }; - protected JScrollPane scrl_foundStructures = new JScrollPane( - tbl_summary); + protected JScrollPane scrl_foundStructures = new JScrollPane(tbl_summary); protected JTable tbl_local_pdb = new JTable(); @@ -187,6 +185,7 @@ public abstract class GStructureChooser extends JPanel implements PreferenceSource.STRUCTURE_CHOOSER); protected PDBDocField[] previousWantedFields; + public GStructureChooser() { try @@ -306,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); @@ -316,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 @@ -328,8 +326,7 @@ public abstract class GStructureChooser extends JPanel implements JTabbedPane sourceTabbedPane = (JTabbedPane) changeEvent .getSource(); int index = sourceTabbedPane.getSelectedIndex(); - if (sourceTabbedPane.getTitleAt(index) -.equals(configureCols)) + if (sourceTabbedPane.getTitleAt(index).equals(configureCols)) { btn_view.setEnabled(false); btn_cancel.setEnabled(false); @@ -356,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); @@ -387,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 @@ -464,6 +461,7 @@ public abstract class GStructureChooser extends JPanel implements public class AssociateSeqOptions { private SequenceI sequence; + private String name; public AssociateSeqOptions(SequenceI seq)