- Simexplorer-si-commits - mailman.cloud.codelutin.com

r715 - in trunk/simexplorer-is-swing/src: java/fr/cemagref/simexplorer/is/ui/swing uimodel/fr/cemagref/simexplorer/is/ui/swing/tab
by tchemit＠users.labs.libre-entreprise.org 07 Feb '08

07 Feb '08

Author: tchemit Date: 2008-02-07 13:24:16 +0000 (Thu, 07 Feb 2008) New Revision: 715 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx Log: mise en place lise attachments dans l'ui 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 12:55:43 UTC (rev 714) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java 2008-02-07 13:24:16 UTC (rev 715) @@ -321,17 +321,29 @@ JList listAttachments = ui.getDetailAttachments(); DefaultListModel listModel = (DefaultListModel) listAttachments.getModel(); listModel.setSize(0); - if (!attachments.isEmpty()) { - ui.getDetailAttachmentsHeader().setText(_("simexplorer.node.attachments")); + listModel.trimToSize(); + if (attachments.isEmpty()) { + ui.getDetailAttachmentsHeader().setText(_("simexplorer.node.noattachments")); + Dimension dimHead = ui.getDetailHeaderAttachmentsPanel().getPreferredSize(); + ui.getScrollAttachments().setPreferredSize(new Dimension((int) dimHead.getWidth(), (int) (dimHead.getHeight()+3))); + listAttachments.setVisible(false); + } else { + ui.getDetailAttachmentsHeader().setText(_("simexplorer.node.attachments", attachments.size())); for (Attachment attachment : attachments) { listModel.addElement(attachment); } listAttachments.setSelectedIndex(0); + nbRows = listModel.getSize(); + if (nbRows > 10) { + nbRows = 10; + } + 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()))))); } table.invalidate(); listAttachments.invalidate(); - ui.getScrollPane().repaint(); ui.repaint(); } Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx =================================================================== --- trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx 2008-02-07 12:55:43 UTC (rev 714) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx 2008-02-07 13:24:16 UTC (rev 715) @@ -16,7 +16,6 @@ </row> <row> <cell fill='vertical'> -  <JPanel id='detailHeaderPanel' background='{Color.WHITE}' border='{javax.swing.border.LineBorder.createBlackLineBorder()}'> <JLabel id='detailHeader' text='{_("simexplorer.node.nodetail")}'/> </JPanel> @@ -24,7 +23,7 @@ </row> <row> <cell fill='vertical'> - <JPanel id='detailHeaderAttachmentsPanel'> + <JPanel id='detailHeaderAttachmentsPanel' background='{Color.WHITE}' border='{javax.swing.border.LineBorder.createBlackLineBorder()}'> <JLabel id='detailAttachmentsHeader' text='{_("simexplorer.node.noattachments")}'/> </JPanel> </cell> @@ -35,63 +34,63 @@ <JScrollPane columnHeaderView='{toolbar}'> <JTree id="navigationTree" model='{new javax.swing.tree.DefaultTreeModel(null)}'/> </JScrollPane> - <JScrollPane id="scrollPane" columnHeaderView='{detailHeaderPanel}'> -  - <Table id='detail' insets='2,2,2,1'> - <row fill='vertical'> - <cell anchor='west'> - <JLabel text='{_("simexplorer.common.type")}'/> - </cell> - <cell weightx="1" anchor='east'> - <JLabel id='detailType'/> - </cell> - </row> - <row> - <cell anchor='west'> - <JLabel text='{_("simexplorer.common.version")}'/> - </cell> - <cell weightx="1" anchor='east'> - <JComboBox id='detailVersions' model='{new DefaultComboBoxModel()}'/> - </cell> - </row> - <row fill='vertical'> - <cell anchor='west'> - <JLabel text='{_("simexplorer.common.description")}'/> - </cell> - <cell weightx="1" anchor='east'> - <JLabel id='detailDescription'/> - </cell> - </row> - <row fill='vertical'> - <cell anchor='west'> - <JLabel text='{_("simexplorer.common.creationDate")}'/> - </cell> - <cell anchor='east'> - <JLabel id='detailCreationDate'/> - </cell> - </row> - <row> - <cell columns='2' fill='horizontal'> - <JScrollPane id='scrollTable'> - <JTable id="detailTable" model='{new fr.cemagref.simexplorer.is.ui.swing.model.JDetailTableModel()}' focusable='false' enabled='false'/> - </JScrollPane> - </cell> - </row> - <row> - <cell columns='2' fill='horizontal'> - <JScrollPane id='scrollAttachments' columnHeaderView='{detailHeaderAttachmentsPanel}'> - <JList id="detailAttachments" model='{new DefaultListModel()}' /> - </JScrollPane> - </cell> - </row> - <row weighty="1" weightx="2" > - <cell fill='both' columns='2'> - <JPanel> - <JLabel text=''/> - </JPanel> - </cell> - </row> - </Table> + <JScrollPane id="scrollPane" columnHeaderView='{detailHeaderPanel}'> + <Table id='detail' insets='2,2,2,1'> + <row fill='vertical'> + <cell anchor='west'> + <JLabel text='{_("simexplorer.common.type")}'/> + </cell> + <cell weightx="1" anchor='east'> + <JLabel id='detailType'/> + </cell> + </row> + <row> + <cell anchor='west'> + <JLabel text='{_("simexplorer.common.version")}'/> + </cell> + <cell weightx="1" anchor='east'> + <JComboBox id='detailVersions' model='{new DefaultComboBoxModel()}'/> + </cell> + </row> + <row fill='vertical'> + <cell anchor='west'> + <JLabel text='{_("simexplorer.common.description")}'/> + </cell> + <cell weightx="1" anchor='east'> + <JLabel id='detailDescription'/> + </cell> + </row> + <row fill='vertical'> + <cell anchor='west'> + <JLabel text='{_("simexplorer.common.creationDate")}'/> + </cell> + <cell anchor='east'> + <JLabel id='detailCreationDate'/> + </cell> + </row> + <row> + <cell columns='2' fill='horizontal'> + <JScrollPane id='scrollTable'> + <JTable id="detailTable" model='{new fr.cemagref.simexplorer.is.ui.swing.model.JDetailTableModel()}' + focusable='false' enabled='false'/> + </JScrollPane> + </cell> + </row> + <row> + <cell columns='2' fill='horizontal'> + <JScrollPane id='scrollAttachments'columnHeaderView='{detailHeaderAttachmentsPanel}'> + <JList id="detailAttachments" model='{new DefaultListModel()}'/> + </JScrollPane> + </cell> + </row> + <row weighty="1" weightx="2"> + <cell fill='both' columns='2'> + <JPanel> + <JLabel text=''/> + </JPanel> + </cell> + </row> + </Table> </JScrollPane> </JSplitPane> </cell>

1 0

r714 - trunk/simexplorer-is-swing/src/resources/i18n
by tchemit＠users.labs.libre-entreprise.org 07 Feb '08

07 Feb '08

Author: tchemit Date: 2008-02-07 12:55:43 +0000 (Thu, 07 Feb 2008) New Revision: 714 Modified: trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties Log: i18n attachments Modified: trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties =================================================================== --- trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-07 11:19:43 UTC (rev 713) +++ trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-07 12:55:43 UTC (rev 714) @@ -143,6 +143,7 @@ simexplorer.main.menu=Main simexplorer.main.ui.title=SimExplorer SI v 0.0.1 simexplorer.message.reset.user.configuration= +simexplorer.node.attachments=Attachments ({0}) simexplorer.node.codes=Codes simexplorer.node.components=Components simexplorer.node.constants=Constants @@ -150,6 +151,7 @@ simexplorer.node.detail=Detail of ''{0}'' [{1}] simexplorer.node.explorations=Exlorations simexplorer.node.libraries=Librairies +simexplorer.node.noattachments=No attachment simexplorer.node.nodetail=No detail simexplorer.node.structures=Structures simexplorer.option.description.config=change value of configuration property (with **key**) by value **value**. Modified: trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties =================================================================== --- trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-07 11:19:43 UTC (rev 713) +++ trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-07 12:55:43 UTC (rev 714) @@ -143,6 +143,7 @@ simexplorer.main.menu=Menu principal simexplorer.main.ui.title=SimExplorer SI v 0.0.1 simexplorer.message.reset.user.configuration= +simexplorer.node.attachments=Fichier(s) attaché(s) ({0}) simexplorer.node.codes=Codes simexplorer.node.components=Composants simexplorer.node.constants=Constantes @@ -150,6 +151,7 @@ simexplorer.node.detail=D\u00E9tail de ''{0}'' [{1}] simexplorer.node.explorations=Exlorations simexplorer.node.libraries=Librairies +simexplorer.node.noattachments=Pas de fichier attaché simexplorer.node.nodetail=Pas de d\u00E9tail simexplorer.node.structures=Structures simexplorer.option.description.config=remplace la valeur d'une propri\u00E9t\u00E9 de clef **key** de la configuration par la valeur **value**.

1 0

r713 - trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/attachment
by tchemit＠users.labs.libre-entreprise.org 07 Feb '08

07 Feb '08

Author: tchemit Date: 2008-02-07 11:19:43 +0000 (Thu, 07 Feb 2008) New Revision: 713 Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/attachment/Attachment.java Log: inline variable Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/attachment/Attachment.java =================================================================== --- trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/attachment/Attachment.java 2008-02-07 11:19:14 UTC (rev 712) +++ trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/attachment/Attachment.java 2008-02-07 11:19:43 UTC (rev 713) @@ -116,8 +116,7 @@ * @return the hash from unique id */ public static String getHashFromUniqueId(String uniqueId) { - String hexHash = uniqueId.substring(0, 32); - return hexHash; + return uniqueId.substring(0, 32); } /* (non-Javadoc)

1 0

r712 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions
by tchemit＠users.labs.libre-entreprise.org 07 Feb '08

07 Feb '08

Author: tchemit Date: 2008-02-07 11:19:14 +0000 (Thu, 07 Feb 2008) New Revision: 712 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAction.java Log: ajout TODO Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAction.java 2008-02-07 11:19:03 UTC (rev 711) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAction.java 2008-02-07 11:19:14 UTC (rev 712) @@ -100,6 +100,7 @@ @Override protected void doAction(ActionEvent e) throws Exception { super.doAction(e); + //TODO push this in StorageHelper StorageService service = getContext().getStorageService(((DetailTabModel) getModel()).isRemote()); RemoteInputStream ris = service.exportElement(getContext().getToken(), uuid, version.toString()); if (ris == null) {

1 0

r711 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service
by tchemit＠users.labs.libre-entreprise.org 07 Feb '08

07 Feb '08

Author: tchemit Date: 2008-02-07 11:19:03 +0000 (Thu, 07 Feb 2008) New Revision: 711 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java Log: rnommage variable ajout check sur les m?\195?\169thodes non encore implant?\195?\169es Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-02-07 11:18:36 UTC (rev 710) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-02-07 11:19:03 UTC (rev 711) @@ -169,9 +169,9 @@ return null; } Version v = Version.valueOf(version); - for (LoggableElement ea : eas) { - if (ea.getMetaData().getVersion().equals(v)) { - return ea; + for (LoggableElement element : eas) { + if (element.getMetaData().getVersion().equals(v)) { + return element; } } return null; @@ -204,16 +204,14 @@ * @see fr.cemagref.simexplorer.is.service.StorageService#deleteElement(java.lang.String, java.lang.String, java.lang.String) */ public void deleteElement(String token, String uuid, String version) { - // TODO Auto-generated method stub - + checkImplemented(); } /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.StorageService#deleteElement(java.lang.String, java.lang.String) */ public void deleteElement(String token, String uuid) { - // TODO Auto-generated method stub - + checkImplemented(); } }

1 0

r710 - trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service
by tchemit＠users.labs.libre-entreprise.org 07 Feb '08

07 Feb '08

Author: tchemit Date: 2008-02-07 11:18:36 +0000 (Thu, 07 Feb 2008) New Revision: 710 Modified: trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceMassInsert.java Log: redundant initializer Modified: trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceMassInsert.java =================================================================== --- trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceMassInsert.java 2008-02-07 11:18:25 UTC (rev 709) +++ trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceMassInsert.java 2008-02-07 11:18:36 UTC (rev 710) @@ -114,7 +114,7 @@ Date begin = new Date(); for (int i = 0; i < c; i++) { - ExplorationApplication parentEa = null; + ExplorationApplication parentEa; parentEa = elementGenerator.generateRandomEA(); int v = 2 + r.nextInt(5);

1 0

r709 - trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service
by tchemit＠users.labs.libre-entreprise.org 07 Feb '08

07 Feb '08

Author: tchemit Date: 2008-02-07 11:18:25 +0000 (Thu, 07 Feb 2008) New Revision: 709 Modified: trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceTest.java Log: imports unused Modified: trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceTest.java =================================================================== --- trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceTest.java 2008-02-07 11:18:09 UTC (rev 708) +++ trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceTest.java 2008-02-07 11:18:25 UTC (rev 709) @@ -17,33 +17,19 @@ * ##% */ package fr.cemagref.simexplorer.is.service; -import java.io.ByteArrayInputStream; -import java.io.FileInputStream; -import java.io.InputStream; -import java.util.HashMap; -import java.util.Map; -import java.util.Random; -import java.util.UUID; - -import junit.framework.TestCase; - -import com.healthmarketscience.rmiio.RemoteInputStream; import com.healthmarketscience.rmiio.RemoteInputStreamServer; import com.healthmarketscience.rmiio.SimpleRemoteInputStream; +import junit.framework.TestCase; -import fr.cemagref.simexplorer.is.attachment.Attachment; +import java.io.FileInputStream; +import java.io.InputStream; -/** - * The Class StorageServiceTest. - */ +/** The Class StorageServiceTest. */ public class StorageServiceTest extends TestCase { /** The storage service. */ private StorageService storageService; - /** The r. */ - private Random r = new Random(); - /* (non-Javadoc) * @see junit.framework.TestCase#setUp() */ @@ -64,9 +50,8 @@ /** * Test insert element zip. - * - * @throws Exception - * the exception + * + * @throws Exception the exception */ public void testInsertElementZip() throws Exception { InputStream zipStream = new FileInputStream(

1 0

r708 - trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service
by tchemit＠users.labs.libre-entreprise.org 07 Feb '08

07 Feb '08

Author: tchemit Date: 2008-02-07 11:18:09 +0000 (Thu, 07 Feb 2008) New Revision: 708 Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java Log: javadoc Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java 2008-02-07 11:05:57 UTC (rev 707) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java 2008-02-07 11:18:09 UTC (rev 708) @@ -174,9 +174,9 @@ * the uuid * @param version * the version - * @param dataKey - * the data key - * + * + * @param attachment the attachment + * * @return the remote input stream * * @throws SimExplorerServiceException

1 0

r707 - in trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing: . actions
by tchemit＠users.labs.libre-entreprise.org 07 Feb '08

07 Feb '08

Author: tchemit Date: 2008-02-07 11:05:57 +0000 (Thu, 07 Feb 2008) New Revision: 707 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/actions/ShowDetailTabAction.java Log: ajout attachments renommage m?\195?\169thodes passage en log debug sur les changements de propri?\195?\169t?\195?\169s 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 11:05:05 UTC (rev 706) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java 2008-02-07 11:05:57 UTC (rev 707) @@ -18,6 +18,7 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing; +import fr.cemagref.simexplorer.is.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.entities.metadata.Version; @@ -37,15 +38,18 @@ import javax.swing.AbstractButton; import javax.swing.DefaultComboBoxModel; +import javax.swing.DefaultListModel; import javax.swing.JComboBox; +import javax.swing.JList; import javax.swing.JTabbedPane; import javax.swing.JTable; import javax.swing.SwingUtilities; +import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreeNode; -import javax.swing.tree.DefaultTreeModel; +import java.awt.Dimension; import java.text.SimpleDateFormat; +import java.util.List; import java.util.regex.Matcher; -import java.awt.Dimension; /** * Cette classe contient les méthodes utiles et réutilisables pour rafraichit @@ -253,7 +257,7 @@ while (size > combo.getItemCount()) { combo.addItem(combo.getItemCount()); } - } + } //System.out.println("new page size : " + combo.getItemCount()); combo.setSelectedIndex(model.getPagination().getCurrentPage()); @@ -269,7 +273,7 @@ boolean nodetail = versions == null || selectedNode == null; // and the selection if (nodetail) { - resetDetail(ui); + resetDetailPanel(ui); } else { for (Version version : versions) { historyModel.addElement(version); @@ -286,13 +290,19 @@ } } - public static void resetDetail(final JApplicationDetailTab ui) { + public static void resetDetailPanel(final JApplicationDetailTab ui) { ui.getDetailHeader().setText(_("simexplorer.node.nodetail")); + ui.getDetailAttachmentsHeader().setText(_("simexplorer.node.noattachments")); + JList listAttchments = ui.getDetailAttachments(); + listAttchments.clearSelection(); + DefaultListModel listModel = (DefaultListModel) listAttchments.getModel(); + listModel.setSize(0); + listModel.trimToSize(); ui.getDetail().setVisible(false); ((JDetailTableModel) ui.getDetailTable().getModel()).setData(null); } - public static void updateDetail(Integer index, final JApplicationDetailTab ui, DetailTabModel model, LoggableElement selectedNode) { + public static void updateDetailPanel(Integer index, final JApplicationDetailTab ui, DetailTabModel model, LoggableElement selectedNode) { MetaData detail = model.getDetail(); ui.getDetailVersions().setSelectedIndex(index); ui.getDetailHeader().setText(_("simexplorer.node.detail", selectedNode.getMetaData().getName(), model.getSelectedVersion())); @@ -302,17 +312,31 @@ ui.getDetail().setVisible(true); JTable table = ui.getDetailTable(); ((JDetailTableModel) table.getModel()).setData(detail); - int nbRows = table.getRowCount()+1; - if (nbRows>20) { - nbRows=20; + int nbRows = table.getRowCount() + 1; + if (nbRows > 20) { + nbRows = 20; } - ui.getScrollTable().setPreferredSize(new Dimension((int) table.getSize().getWidth(),2+(nbRows*(4+table.getFont().getSize())))); + ui.getScrollTable().setPreferredSize(new Dimension((int) table.getSize().getWidth(), 2 + (nbRows * (4 + table.getFont().getSize())))); + List<Attachment> attachments = detail.getAttachments(); + JList listAttachments = ui.getDetailAttachments(); + DefaultListModel listModel = (DefaultListModel) listAttachments.getModel(); + listModel.setSize(0); + if (!attachments.isEmpty()) { + ui.getDetailAttachmentsHeader().setText(_("simexplorer.node.attachments")); + for (Attachment attachment : attachments) { + listModel.addElement(attachment); + } + listAttachments.setSelectedIndex(0); + } + table.invalidate(); + listAttachments.invalidate(); + ui.getScrollPane().repaint(); ui.repaint(); } - public static void updateNavigationTree(JApplicationDetailTab ui, DetailTabModel model) { + public static void updateDetailNavigationTree(JApplicationDetailTab ui, DetailTabModel model) { // create navigation tree TreeNode root = LoggableElementTreeHelper.buildLoggableElementNode(model.getRootNode()); // push it in tree model Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java 2008-02-07 11:05:05 UTC (rev 706) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java 2008-02-07 11:05:57 UTC (rev 707) @@ -28,6 +28,7 @@ import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationDetailTab; import javax.swing.DefaultComboBoxModel; +import javax.swing.DefaultListModel; import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; import javax.swing.tree.TreePath; @@ -76,7 +77,7 @@ } protected void initUI(JApplicationDetailTab ui, DetailTabModel model) { - SimExplorerUIRefreshHelper.updateNavigationTree(ui, model); + SimExplorerUIRefreshHelper.updateDetailNavigationTree(ui, model); } /** @@ -143,7 +144,7 @@ * @param evt event coming from DetailTabModel */ public void propertyChange(PropertyChangeEvent evt) { - log.info(evt.getPropertyName() + " old:" + evt.getOldValue() + ", new:" + evt.getNewValue()); + log.debug(evt.getPropertyName() + " old:" + evt.getOldValue() + ", new:" + evt.getNewValue()); JApplicationDetailTab ui = getTabUI(); DetailTabModel model = getTabModel(); DefaultComboBoxModel historyModel = (DefaultComboBoxModel) ui.getDetailVersions().getModel(); @@ -182,7 +183,7 @@ throw new NullPointerException("can not have a selectedItem null"); } Version selectedVersion = Version.valueOf(selectedItem.toString()); - log.info("selected version (" + selectedVersion+ ") " + selectedItem); + log.debug("selected version (" + selectedVersion+ ") " + selectedItem); metas = StorageServiceHelper.getMetaData( getContext(), model.isRemote(), @@ -203,7 +204,7 @@ * @param evt property changed event */ public void propertyChange(PropertyChangeEvent evt) { - log.info(evt.getPropertyName() + " old:" + evt.getOldValue() + ", new:" + evt.getNewValue()); + log.debug(evt.getPropertyName() + " old:" + evt.getOldValue() + ", new:" + evt.getNewValue()); Integer index = (Integer) evt.getNewValue(); JApplicationDetailTab ui = getTabUI(); DetailTabModel model = getTabModel(); @@ -214,9 +215,9 @@ // again setEnabled(false); if (index == null || index == -1) { - SimExplorerUIRefreshHelper.resetDetail(ui); + SimExplorerUIRefreshHelper.resetDetailPanel(ui); } else { - SimExplorerUIRefreshHelper.updateDetail(index, ui, model, selectedNode); + SimExplorerUIRefreshHelper.updateDetailPanel(index, ui, model, selectedNode); } setEnabled(wasEnable); }

1 0

r706 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model
by tchemit＠users.labs.libre-entreprise.org 07 Feb '08

07 Feb '08

Author: tchemit Date: 2008-02-07 11:05:05 +0000 (Thu, 07 Feb 2008) New Revision: 706 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java Log: ajoutm?\195?\169thode pour d?\195?\169ttacher tous les listeners Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java 2008-02-07 11:04:43 UTC (rev 705) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java 2008-02-07 11:05:05 UTC (rev 706) @@ -136,6 +136,7 @@ Integer index = getVersionIndex(version); Integer oldSelectedVersionIndex = this.selectedVersionIndex; this.selectedVersionIndex = index; + // ui must update detail panel for the selected node and version firePropertyChange(Properties.SELECTED_VERSION_INDEX_PROPERTY_CHANGED, oldSelectedVersionIndex, selectedVersionIndex); } @@ -204,6 +205,15 @@ changeSupport.removePropertyChangeListener(listener); } + public synchronized void removePropertyChangeListeners() { + if (changeSupport == null) { + return; + } + for (PropertyChangeListener listener : getPropertyChangeListeners()) { + changeSupport.removePropertyChangeListener(listener); + } + } + public synchronized PropertyChangeListener[] getPropertyChangeListeners() { if (changeSupport == null) { return new PropertyChangeListener[0];

1 0