X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGStructureChooser.java;h=e571064b5e97e12c7573a011927e6e40b889b40d;hb=a31a02714259bddad8163062afc770e89114d0d4;hp=ed94172fd56cacc5f87cbc5a0c8bb308c8de5356;hpb=64dd25185d2caf389946bb7e70053183d5aa31a6;p=jalview.git diff --git a/src/jalview/jbgui/GStructureChooser.java b/src/jalview/jbgui/GStructureChooser.java index ed94172..e571064 100644 --- a/src/jalview/jbgui/GStructureChooser.java +++ b/src/jalview/jbgui/GStructureChooser.java @@ -44,6 +44,8 @@ import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; import javax.swing.ImageIcon; import javax.swing.JButton; @@ -61,6 +63,8 @@ import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; +import javax.swing.event.InternalFrameEvent; +import javax.swing.table.TableColumn; @SuppressWarnings("serial") /** @@ -158,8 +162,69 @@ 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_local_pdb = new JTable(); + + protected JScrollPane scrl_localPDB = new JScrollPane(tbl_local_pdb); + + private JTabbedPane pnl_filter = new JTabbedPane(); + + protected FTSDataColumnPreferences pdbDocFieldPrefs = new FTSDataColumnPreferences( + PreferenceSource.STRUCTURE_CHOOSER, + PDBFTSRestClient.getInstance()); + + protected FTSDataColumnI[] previousWantedFields; + + protected static Map tempUserPrefs = new HashMap(); + + private JTable tbl_summary = new JTable() { + private boolean inLayout; + + @Override + public boolean getScrollableTracksViewportWidth() + { + return hasExcessWidth(); + + } + + @Override + public void doLayout() + { + if (hasExcessWidth()) + { + autoResizeMode = AUTO_RESIZE_SUBSEQUENT_COLUMNS; + } + inLayout = true; + super.doLayout(); + inLayout = false; + autoResizeMode = AUTO_RESIZE_OFF; + } + + protected boolean hasExcessWidth() + { + return getPreferredSize().width < getParent().getWidth(); + } + + @Override + public void columnMarginChanged(ChangeEvent e) + { + if (isEditing()) + { + removeEditor(); + } + TableColumn resizingColumn = getTableHeader().getResizingColumn(); + // Need to do this here, before the parent's + // layout manager calls getPreferredSize(). + if (resizingColumn != null && autoResizeMode == AUTO_RESIZE_OFF + && !inLayout) + { + resizingColumn.setPreferredWidth(resizingColumn.getWidth()); + String colHeader = resizingColumn.getHeaderValue().toString(); + tempUserPrefs.put(colHeader, resizingColumn.getWidth()); + } + resizeAndRepaint(); + } + @Override public String getToolTipText(MouseEvent evt) { @@ -190,17 +255,6 @@ public abstract class GStructureChooser extends JPanel implements protected JScrollPane scrl_foundStructures = new JScrollPane(tbl_summary); - protected JTable tbl_local_pdb = new JTable(); - - protected JScrollPane scrl_localPDB = new JScrollPane(tbl_local_pdb); - - private JTabbedPane pnl_filter = new JTabbedPane(); - - private FTSDataColumnPreferences pdbDocFieldPrefs = new FTSDataColumnPreferences( - PreferenceSource.STRUCTURE_CHOOSER, PDBFTSRestClient.getInstance()); - - protected FTSDataColumnI[] previousWantedFields; - public GStructureChooser() { try @@ -222,6 +276,10 @@ public abstract class GStructureChooser extends JPanel implements */ private void jbInit() throws Exception { + Integer width = tempUserPrefs.get("structureChooser.width") == null ? 800 + : tempUserPrefs.get("structureChooser.width"); + Integer height = tempUserPrefs.get("structureChooser.height") == null ? 400 + : tempUserPrefs.get("structureChooser.height"); tbl_summary.setAutoCreateRowSorter(true); tbl_summary.getTableHeader().setReorderingAllowed(false); tbl_summary.addMouseListener(new MouseAdapter() @@ -355,7 +413,7 @@ public abstract class GStructureChooser extends JPanel implements @Override public void actionPerformed(ActionEvent e) { - mainFrame.dispose(); + closeAction(); } }); btn_cancel.addKeyListener(new KeyAdapter() @@ -365,7 +423,7 @@ public abstract class GStructureChooser extends JPanel implements { if (evt.getKeyCode() == KeyEvent.VK_ENTER) { - mainFrame.dispose(); + closeAction(); } } }); @@ -393,11 +451,9 @@ public abstract class GStructureChooser extends JPanel implements } }); - scrl_foundStructures.setPreferredSize(new Dimension(500, 300)); - scrl_foundStructures - .setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + scrl_foundStructures.setPreferredSize(new Dimension(width, height)); - scrl_localPDB.setPreferredSize(new Dimension(500, 300)); + scrl_localPDB.setPreferredSize(new Dimension(width, height)); scrl_localPDB .setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); @@ -405,9 +461,8 @@ public abstract class GStructureChooser extends JPanel implements chk_invertFilter.setFont(new java.awt.Font("Verdana", 0, 12)); chk_rememberSettings.setFont(new java.awt.Font("Verdana", 0, 12)); chk_rememberSettings.setVisible(false); - - txt_search.setToolTipText(MessageManager - .getString("label.enter_pdb_id")); + txt_search.setToolTipText(JvSwingUtils.wrapTooltip(true, + MessageManager.getString("label.enter_pdb_id"))); cmb_filterOption.setToolTipText(MessageManager .getString("info.select_filter_option")); txt_search.getDocument().addDocumentListener(new DocumentListener() @@ -474,7 +529,7 @@ public abstract class GStructureChooser extends JPanel implements btn_cancel.setEnabled(false); btn_view.setVisible(false); btn_cancel.setVisible(false); - previousWantedFields = FTSDataColumnPreferences + previousWantedFields = pdbDocFieldPrefs .getStructureSummaryFields().toArray( new FTSDataColumnI[0]); } @@ -494,7 +549,7 @@ public abstract class GStructureChooser extends JPanel implements } }; pnl_filter.addChangeListener(changeListener); - pnl_filter.setPreferredSize(new Dimension(500, 300)); + pnl_filter.setPreferredSize(new Dimension(width, height)); pnl_filter.add(foundStructureSummary, scrl_foundStructures); pnl_filter.add(configureCols, pdbDocFieldPrefs); @@ -515,22 +570,52 @@ public abstract class GStructureChooser extends JPanel implements statusPanel.add(statusBar, null); this.add(pnl_actionsAndStatus, java.awt.BorderLayout.SOUTH); + mainFrame + .addInternalFrameListener(new javax.swing.event.InternalFrameAdapter() + { + @Override + public void internalFrameClosing(InternalFrameEvent e) + { + closeAction(); + } + }); mainFrame.setVisible(true); mainFrame.setContentPane(this); mainFrame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); - Desktop.addInternalFrame(mainFrame, frameTitle, 800, 400); + Integer x = tempUserPrefs.get("structureChooser.x"); + Integer y = tempUserPrefs.get("structureChooser.y"); + if (x != null && y != null) + { + mainFrame.setLocation(x, y); + } + Desktop.addInternalFrame(mainFrame, frameTitle, width, height); } + protected void closeAction() + { + // System.out.println(">>>>>>>>>> closing internal frame!!!"); + // System.out.println("width : " + mainFrame.getWidth()); + // System.out.println("heigh : " + mainFrame.getHeight()); + // System.out.println("x : " + mainFrame.getX()); + // System.out.println("y : " + mainFrame.getY()); + tempUserPrefs.put("structureChooser.width", pnl_filter.getWidth()); + tempUserPrefs.put("structureChooser.height", pnl_filter.getHeight()); + tempUserPrefs.put("structureChooser.x", mainFrame.getX()); + tempUserPrefs.put("structureChooser.y", mainFrame.getY()); + mainFrame.dispose(); + } public boolean wantedFieldsUpdated() { if (previousWantedFields == null) { return true; } - - return Arrays.equals(FTSDataColumnPreferences.getStructureSummaryFields() - .toArray(new FTSDataColumnI[0]), - previousWantedFields) ? false : true; + + FTSDataColumnI[] currentWantedFields = pdbDocFieldPrefs + .getStructureSummaryFields() + .toArray(new FTSDataColumnI[0]); + return Arrays.equals(currentWantedFields, previousWantedFields) ? false + : true; } @@ -704,6 +789,10 @@ public abstract class GStructureChooser extends JPanel implements } } + public JTable getResultTable() + { + return tbl_summary; + } public JComboBox getCmbFilterOption() { return cmb_filterOption;