Author: tchemit Date: 2008-02-07 14:47:15 +0000 (Thu, 07 Feb 2008) New Revision: 723 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java Log: descriptors +meilleur calcul taille TODO faire de meme pour la table Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java 2008-02-07 14:46:25 UTC (rev 722) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java 2008-02-07 14:47:15 UTC (rev 723) @@ -47,6 +47,7 @@ import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreeNode; import java.awt.Dimension; +import java.awt.Rectangle; import java.text.SimpleDateFormat; import java.util.List; import java.util.regex.Matcher; @@ -306,6 +307,7 @@ MetaData detail = model.getDetail(); ui.getDetailVersions().setSelectedIndex(index); ui.getDetailHeader().setText(_("simexplorer.node.detail", selectedNode.getMetaData().getName(), model.getSelectedVersion())); + ui.getDetailDescriptorsHeader().setText(_("simexplorer.node.descriptors", detail.getDescriptors().size())); ui.getDetailType().setText(detail.getType()); ui.getDetailDescription().setText(detail.getDescription()); ui.getDetailCreationDate().setText(DATE_FORMAT.format(detail.getCreationDate())); @@ -313,8 +315,8 @@ JTable table = ui.getDetailTable(); ((JDetailTableModel) table.getModel()).setData(detail); int nbRows = table.getRowCount() + 1; - if (nbRows > 20) { - nbRows = 20; + if (nbRows > 11) { + nbRows = 11; } ui.getScrollTable().setPreferredSize(new Dimension((int) table.getSize().getWidth(), 2 + (nbRows * (4 + table.getFont().getSize())))); List<Attachment> attachments = detail.getAttachments(); @@ -339,7 +341,9 @@ } Dimension dimHead = ui.getDetailHeaderAttachmentsPanel().getPreferredSize(); listAttachments.setVisible(true); - ui.getScrollAttachments().setPreferredSize(new Dimension((int) dimHead.getWidth(), (int) (dimHead.getHeight() + 4 + (nbRows * (4 + listAttachments.getFont().getSize()))))); + Rectangle rect = listAttachments.getUI().getCellBounds(listAttachments, 0, 0); + double h = rect.getHeight(); + ui.getScrollAttachments().setPreferredSize(new Dimension((int) dimHead.getWidth(), (int) (dimHead.getHeight() +3+ nbRows * h))); } table.invalidate();