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

r765 - in trunk/simexplorer-is-swing/src: java/fr/cemagref/simexplorer/is/ui/swing test/fr/cemagref/simexplorer/is/ui test/fr/cemagref/simexplorer/is/ui/swing
by tchemit＠users.labs.libre-entreprise.org Feb. 8, 2008

Feb. 8, 2008

Author: tchemit Date: 2008-02-08 18:39:46 +0000 (Fri, 08 Feb 2008) New Revision: 765 Added: trunk/simexplorer-is-swing/src/test/fr/cemagref/simexplorer/is/ui/swing/ trunk/simexplorer-is-swing/src/test/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelperTest.java Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java Log: optimisation ui (essaye de remplir au plus)+ test 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-08 18:07:34 UTC (rev 764) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java 2008-02-08 18:39:46 UTC (rev 765) @@ -19,8 +19,8 @@ package fr.cemagref.simexplorer.is.ui.swing; import fr.cemagref.simexplorer.is.attachment.Attachment; +import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; -import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.ui.SimExplorer; @@ -40,12 +40,12 @@ import javax.swing.AbstractButton; import javax.swing.DefaultComboBoxModel; import javax.swing.DefaultListModel; +import javax.swing.JButton; import javax.swing.JComboBox; import javax.swing.JList; import javax.swing.JTabbedPane; import javax.swing.JTable; import javax.swing.SwingUtilities; -import javax.swing.JButton; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreeNode; import java.awt.Dimension; @@ -188,17 +188,17 @@ /** * Rafraichit les actions d'un node dans l'arbre de navigation * - * @param ui l'onglet de détail + * @param ui l'onglet de détail * @param model le model de d'onglet detail - * @param node le node sélectionné dans l'arbre de navigation + * @param node le node sélectionné dans l'arbre de navigation */ public static void refreshDetailActions(JApplicationDetailTab ui, DetailTabModel model, LoggableElementTreeNode node) { // refresh download LoggableElement button - refreshDownloadLoggableElementAction(ui, model,node); + refreshDownloadLoggableElementAction(ui, model, node); // refresh download Attachment button refreshDownloadAttachmentAction(ui, model); // refresh delete button - refreshDeleteAction(ui,model); + refreshDeleteAction(ui, model); // refresh export button refreshExportAction(ui, model); // refresh tree buttons @@ -208,40 +208,40 @@ protected static void refreshTreeActions(JApplicationDetailTab ui, LoggableElementTreeNode node) { String tooltip; - boolean enabled = node!=null && !node.isLeaf() && node.getChildCount()>0; - tooltip = !enabled?null: _("simexplorer.action.application.collapseAll2", node.getUserObject()); + boolean enabled = node != null && !node.isLeaf() && node.getChildCount() > 0; + tooltip = !enabled ? null : _("simexplorer.action.application.collapseAll2", node.getUserObject()); updateButton(ui.getCollapseAllApplication(), enabled, tooltip); - tooltip = !enabled?null: _("simexplorer.action.application.expandAll2.tooltip", node.getUserObject()); + tooltip = !enabled ? null : _("simexplorer.action.application.expandAll2.tooltip", node.getUserObject()); updateButton(ui.getExpandAllApplication(), enabled, tooltip); } - protected static void refreshDownloadLoggableElementAction(JApplicationDetailTab ui, DetailTabModel model, LoggableElementTreeNode node) { + protected static void refreshDownloadLoggableElementAction(JApplicationDetailTab ui, DetailTabModel model, LoggableElementTreeNode node) { MetaData detail = model.getDetail(); - boolean enabled = detail !=null || LoggableElementTreeHelper.canDownload(node); - String tooltip = !enabled?null:_("simexplorer.action.dowloadLoggableElement2", detail==null?node.getUserObject():detail.getName()+" - "+model.getSelectedVersion()); + boolean enabled = detail != null || LoggableElementTreeHelper.canDownload(node); + String tooltip = !enabled ? null : _("simexplorer.action.dowloadLoggableElement2", detail == null ? node.getUserObject() : detail.getName() + " - " + model.getSelectedVersion()); updateButton(ui.getDownloadLoggableElement(), enabled, tooltip); } public static void refreshDownloadAttachmentAction(JApplicationDetailTab ui, DetailTabModel model) { Attachment attachment = model.getSelectedAttachment(); MetaData detail = model.getDetail(); - boolean enabled = detail!=null && attachment !=null; - String tooltip = !enabled?null:_("simexplorer.action.dowloadAttachment2", attachment,detail.getName()+" - "+model.getSelectedVersion()); + boolean enabled = detail != null && attachment != null; + String tooltip = !enabled ? null : _("simexplorer.action.dowloadAttachment2", attachment, detail.getName() + " - " + model.getSelectedVersion()); updateButton(ui.getDownloadAttachment(), enabled, tooltip); } protected static void refreshDeleteAction(JApplicationDetailTab ui, DetailTabModel model) { MetaData detail = model.getDetail(); - boolean enabled = detail!=null; - String tooltip = !enabled?null:_("simexplorer.action.delete2", detail.getName()+" - "+model.getSelectedVersion()); + boolean enabled = detail != null; + String tooltip = !enabled ? null : _("simexplorer.action.delete2", detail.getName() + " - " + model.getSelectedVersion()); updateButton(ui.getDelete(), enabled, tooltip); } protected static void refreshExportAction(JApplicationDetailTab ui, DetailTabModel model) { MetaData detail = model.getDetail(); LoggableElement sNode = model.getSelectedNode(); - boolean enabled = sNode!=null && sNode instanceof ExplorationApplication; - String tooltip = !enabled?null:_("simexplorer.action.export2", detail.getName()+" - "+model.getSelectedVersion()); + boolean enabled = sNode != null && sNode instanceof ExplorationApplication; + String tooltip = !enabled ? null : _("simexplorer.action.export2", detail.getName() + " - " + model.getSelectedVersion()); updateButton(ui.getExportApplication(), enabled, tooltip); } @@ -333,8 +333,8 @@ ui.getDetailType().setText(detail.getType()); String s = detail.getDescription(); String tooltip = s; - if (s.length()>32) { - s = s.substring(0,32)+"..."; + if (s.length() > 32) { + s = s.substring(0, 32) + "..."; } ui.getDetailDescription().setText(s); if (!s.equals(tooltip)) { @@ -344,33 +344,37 @@ ui.getDetail().setVisible(true); JTable table = ui.getDetailTable(); ((JDetailTableModel) table.getModel()).setData(detail); - int nbRows = table.getRowCount() + 1; - if (nbRows > 6) { - nbRows = 6; - } - ui.getScrollTable().setPreferredSize(new Dimension((int) table.getSize().getWidth(), 2 + (nbRows * (4 + table.getFont().getSize())))); + int nbDescriptorRows = table.getRowCount(); + List<Attachment> attachments = detail.getAttachments(); JList listAttachments = ui.getDetailAttachments(); DefaultListModel listModel = (DefaultListModel) listAttachments.getModel(); listModel.setSize(0); listModel.trimToSize(); + int nbAttachmentRows; if (attachments.isEmpty()) { - ui.getDetailAttachmentsHeader().setText(_("simexplorer.node.noattachments")); - ui.getScrollAttachments().setVisible(false); + ui.getDetailAttachmentsHeader().setText(_("simexplorer.node.noattachments")); + ui.getScrollAttachments().setVisible(false); + nbAttachmentRows = 0; } else { ui.getDetailAttachmentsHeader().setText(_("simexplorer.node.attachments", attachments.size())); for (Attachment attachment : attachments) { listModel.addElement(attachment); } listAttachments.setSelectedIndex(0); - nbRows = listModel.getSize(); - if (nbRows > 5) { - nbRows = 5; - } - //Dimension dimHead = ui.getDetailHeaderAttachmentsPanel().getPreferredSize(); + nbAttachmentRows = listModel.getSize(); ui.getScrollAttachments().setVisible(true); + } + + int[] rows = computeRows(nbDescriptorRows, nbAttachmentRows); + + Dimension dimOneRow = table.getUI().getPreferredSize(table.getTableHeader()); + + ui.getScrollTable().setPreferredSize(new Dimension((int) dimOneRow.getWidth(), 2 + ((rows[0] + 1) * (4 + table.getFont().getSize())))); + //ui.getScrollTable().setPreferredSize(new Dimension((int) table.getSize().getWidth(), 2 + (nbDescriptorRows * (4 + table.getFont().getSize())))); + if (nbAttachmentRows > 0) { Rectangle rect = listAttachments.getUI().getCellBounds(listAttachments, 0, 0); - ui.getScrollAttachments().setPreferredSize(new Dimension((int) rect.getWidth()-4, (int) (3+ nbRows * rect.getHeight()))); + ui.getScrollAttachments().setPreferredSize(new Dimension((int) rect.getWidth() - 4, (int) (3 + rows[1] * rect.getHeight()))); } table.invalidate(); @@ -379,6 +383,42 @@ ui.repaint(); } + public static int[] computeRows(int nbDescriptorRows, int nbAttachmentRows) { + int[] result = new int[2]; + if (nbDescriptorRows == 0) { + result[0] = 0; + result[1] = nbAttachmentRows > 10 ? 10 : nbAttachmentRows; + return result; + } + if (nbAttachmentRows == 0) { + result[0] = nbDescriptorRows > 10 ? 10 : nbDescriptorRows; + result[1] = 0; + return result; + } + if (nbAttachmentRows < 6 && nbDescriptorRows < 6) { + result[0] = nbDescriptorRows; + result[1] = nbAttachmentRows; + return result; + } + if (nbDescriptorRows > 5 && nbAttachmentRows > 5) { + result[0] = result[1] = 5; + return result; + } + if (nbDescriptorRows < 6) { + result[0] = nbDescriptorRows; + int i = 10 - nbDescriptorRows; + result[1] = nbAttachmentRows < i ? nbAttachmentRows : i; + return result; + } + if (nbAttachmentRows < 6) { + int i = 10 - nbAttachmentRows; + result[0] = nbDescriptorRows < i ? nbDescriptorRows : i; + result[1] = nbAttachmentRows; + return result; + } + throw new IllegalStateException("can not come her :)"); + } + public static void updateDetailNavigationTree(JApplicationDetailTab ui, DetailTabModel model) { // create navigation tree TreeNode root = LoggableElementTreeHelper.buildLoggableElementNode(model.getRootNode()); Added: trunk/simexplorer-is-swing/src/test/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelperTest.java =================================================================== --- trunk/simexplorer-is-swing/src/test/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelperTest.java (rev 0) +++ trunk/simexplorer-is-swing/src/test/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelperTest.java 2008-02-08 18:39:46 UTC (rev 765) @@ -0,0 +1,76 @@ +package fr.cemagref.simexplorer.is.ui.swing; + +import junit.framework.TestCase; + +/** + * SimExplorerUIRefreshHelper Tester. + * + * @author chemit + * @version 1.0 + * @since <pre>02/08/2008</pre> + */ +public class SimExplorerUIRefreshHelperTest extends TestCase { + public SimExplorerUIRefreshHelperTest(String name) { + super(name); + } + + public void testComputeRowLimitCases() throws Exception { + for (int i = 0; i < 11; i++) { + assertComputeRow(0, i, SimExplorerUIRefreshHelper.computeRows(0, i)); + } + for (int i = 0; i < 11; i++) { + assertComputeRow(i, 0, SimExplorerUIRefreshHelper.computeRows(i, 0)); + } + assertComputeRow(0, 10, SimExplorerUIRefreshHelper.computeRows(0, 11)); + assertComputeRow(10, 0, SimExplorerUIRefreshHelper.computeRows(11, 0)); + } + + + public void testComputeRowDescriptor() throws Exception { + for (int i = 1; i < 9; i++) { + testComputeRowDescriptor(i); + } + } + + public void testComputeRowAttachment() throws Exception { + for (int i = 1; i < 9; i++) { + testComputeRowAttachment(i); + } + } + + public void testComputeRowAttachment(int nb) throws Exception { + int pivot = 10 - nb; + for (int i = 0; i < pivot + 1; i++) { + assertComputeRow(i, nb, SimExplorerUIRefreshHelper.computeRows(i, nb)); + } + for (int i = pivot + 1; i < 11; i++) { + if (nb + i > 10) { + int[] res = SimExplorerUIRefreshHelper.computeRows(i, nb); + assertEquals(10, res[0] + res[1]); + } else { + assertComputeRow(pivot, nb, SimExplorerUIRefreshHelper.computeRows(i, nb)); + } + } + } + + public void testComputeRowDescriptor(int nb) throws Exception { + int pivot = 10 - nb; + for (int i = 0; i < pivot + 1; i++) { + assertComputeRow(nb, i, SimExplorerUIRefreshHelper.computeRows(nb, i)); + } + for (int i = pivot + 1; i < 11; i++) { + if (nb + i > 10) { + int[] res = SimExplorerUIRefreshHelper.computeRows(nb, i); + assertEquals(10, res[0] + res[1]); + } else { + assertComputeRow(nb, pivot, SimExplorerUIRefreshHelper.computeRows(nb, i)); + } + } + } + + public void assertComputeRow(int expectedOne, int expectedTwo, int[] result) { + assertEquals(expectedOne, result[0]); + assertEquals(expectedTwo, result[1]); + } + +}

1 0

r764 - in trunk: simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/attachment simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service simexplorer-is-service/src/resources/i18n
by glandais＠users.labs.libre-entreprise.org Feb. 8, 2008

Feb. 8, 2008

Author: glandais Date: 2008-02-08 18:07:34 +0000 (Fri, 08 Feb 2008) New Revision: 764 Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/attachment/Attachment.java trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java trunk/simexplorer-is-service/src/resources/i18n/simexplorer-is-service-en_GB.properties trunk/simexplorer-is-service/src/resources/i18n/simexplorer-is-service-fr_FR.properties Log: Import from zip bugs 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-08 17:16:27 UTC (rev 763) +++ trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/attachment/Attachment.java 2008-02-08 18:07:34 UTC (rev 764) @@ -119,6 +119,18 @@ return uniqueId.substring(0, 32); } + /** + * Gets the file name from unique id. + * + * @param uniqueId + * the unique id + * + * @return the file name from unique id + */ + public static String getFileNameFromUniqueId(String uniqueId) { + return uniqueId.substring(32); + } + /* (non-Javadoc) * @see java.lang.Object#hashCode() */ Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-02-08 17:16:27 UTC (rev 763) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-02-08 18:07:34 UTC (rev 764) @@ -31,6 +31,8 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; +import org.codelutin.util.MD5; +import org.codelutin.util.MD5InputStream; import org.codelutin.util.ZipStreamEncoder; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -239,7 +241,7 @@ private MetaData saveElement(String token, InputStream zipStream) throws SimExplorerServiceException { String xmlFile = null; - Map<String, String> attachments = new HashMap<String, String>(); + Map<Attachment, String> attachments = new HashMap<Attachment, String>(); ZipInputStream zis = new ZipInputStream(zipStream); @@ -254,32 +256,37 @@ if (entryName.startsWith(FILE_DATA_PREFIX)) { String fileName = entryName.replace( FILE_DATA_PREFIX + FOLDER_SEPARATOR, ""); + + String zipMD5 = Attachment + .getHashFromUniqueId(fileName); + fileName = Attachment + .getFileNameFromUniqueId(fileName); + + MD5InputStream md5Stream = new MD5InputStream(zis); String idFile = getStorageEngine().storeTempData( - zis); - attachments.put(fileName, idFile); + md5Stream); + + String localMD5 = MD5.asHex(md5Stream.hash()); + + if (!localMD5.equals(zipMD5)) { + + throw new SimExplorerServiceException( + _("simexplorer.service.invalidhash")); + + } + + Attachment attachment = new Attachment(); + attachment.setFileName(fileName); + attachment.setDataHash(localMD5); + attachments.put(attachment, idFile); } } } } - Map<Attachment, String> realAttachments = new HashMap<Attachment, String>(); - - // Load metadata xml - MetaDataFactory<MetaData> mdeFactory = MetaDataFactory - .getFactory(MetaData.class); - MetaData metaData = mdeFactory - .loadElementFromParentXML(getStorageEngine() - .retrieveTempData(xmlFile)); - - List<Attachment> mdeAttachments = metaData.getAttachments(); - for (Attachment attachment : mdeAttachments) { - realAttachments.put(attachment, attachments.get(attachment - .getUniqueId())); - } - - MetaData elementSaved = saveElement(token, xmlFile, realAttachments); + MetaData elementSaved = saveElement(token, xmlFile, attachments); getStorageEngine().deleteTempData(xmlFile); - for (Map.Entry<String, String> tmpId : attachments.entrySet()) { + for (Map.Entry<Attachment, String> tmpId : attachments.entrySet()) { getStorageEngine().deleteTempData(tmpId.getValue()); } return elementSaved; @@ -457,14 +464,15 @@ String idAttachment = idsattachment.get(attachment); // Check hash of attachments - String md5 = getStorageEngine().retrieveMD5TempData(idAttachment); - if (!md5.equals(attachment.getDataHash())) { + if (idAttachment == null) { + throw new SimExplorerServiceException( - _("simexplorer.service.invalidhash")); + _("simexplorer.service.attachmentnotfund")); + } - attachments.put(attachment, getStorageEngine().retrieveTempData( idAttachment)); + } getStorageEngine().saveElement(token, metaData, attachments); Modified: trunk/simexplorer-is-service/src/resources/i18n/simexplorer-is-service-en_GB.properties =================================================================== --- trunk/simexplorer-is-service/src/resources/i18n/simexplorer-is-service-en_GB.properties 2008-02-08 17:16:27 UTC (rev 763) +++ trunk/simexplorer-is-service/src/resources/i18n/simexplorer-is-service-en_GB.properties 2008-02-08 18:07:34 UTC (rev 764) @@ -1,3 +1,4 @@ +simexplorer.service.attachmentnotfund=File not found simexplorer.service.business.groupexist=Group already exist simexplorer.service.business.userexist=User already exist simexplorer.service.invalidhash=Invalid hash for file Modified: trunk/simexplorer-is-service/src/resources/i18n/simexplorer-is-service-fr_FR.properties =================================================================== --- trunk/simexplorer-is-service/src/resources/i18n/simexplorer-is-service-fr_FR.properties 2008-02-08 17:16:27 UTC (rev 763) +++ trunk/simexplorer-is-service/src/resources/i18n/simexplorer-is-service-fr_FR.properties 2008-02-08 18:07:34 UTC (rev 764) @@ -1,3 +1,4 @@ +simexplorer.service.attachmentnotfund=Fichier non trouvé simexplorer.service.business.groupexist=Le groupe existe d\u00E9j\u00E0 simexplorer.service.business.userexist=L'utilisateur existe d\u00E9j\u00E0 simexplorer.service.invalidhash=Hash invalide pour un fichier

1 0

r763 - in trunk: simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages
by glandais＠users.labs.libre-entreprise.org Feb. 8, 2008

Feb. 8, 2008

Author: glandais Date: 2008-02-08 17:16:27 +0000 (Fri, 08 Feb 2008) New Revision: 763 Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceServer.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementImport.java Log: Businness rules when element already exist (versionning) Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java 2008-02-08 16:59:05 UTC (rev 762) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java 2008-02-08 17:16:27 UTC (rev 763) @@ -18,7 +18,6 @@ package fr.cemagref.simexplorer.is.service; import static org.codelutin.i18n.I18n._; - import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.storage.SimExplorerStorageException; import fr.cemagref.simexplorer.is.storage.engine.StorageEngine; @@ -66,8 +65,9 @@ // Version rules if (previousVersion != null) { previousVersion.setLatest(false); - //getStorageEngine().update(previousVersion); - + update(token, previousVersion.getUuid(), previousVersion + .getVersion(), previousVersion); + metaData.setLatest(true); metaData.setVersion(previousVersion.getVersion().incVersion(1) .toString()); Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-02-08 16:59:05 UTC (rev 762) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-02-08 17:16:27 UTC (rev 763) @@ -517,6 +517,44 @@ } /** + * Update. + * + * @param token + * the token + * @param oldVersion + * the old version + * @param newVersion + * the new version + * @param oldUuid + * the old uuid + * + * @throws SimExplorerServiceException + * the sim explorer service exception + */ + protected void update(String token, String oldUuid, Version oldVersion, + MetaData newVersion) throws SimExplorerServiceException { + Map<Attachment, InputStream> attachments = new HashMap<Attachment, InputStream>(); + try { + MetaData oldMetaData = getStorageEngine().getMetadata(token, + oldUuid, oldVersion); + + attachments.put(getXMLAttachment(), getStorageEngine() + .retrieveData(token, oldMetaData, getXMLAttachment())); + + List<Attachment> realAttachments = oldMetaData.getAttachments(); + for (Attachment attachment : realAttachments) { + attachments.put(attachment, getStorageEngine().retrieveData( + token, oldMetaData, attachment)); + } + + getStorageEngine().saveElement(token, newVersion, attachments); + getStorageEngine().commit(); + } catch (SimExplorerStorageException e) { + throw new SimExplorerServiceException(e); + } + } + + /** * Process version rules. * * @param token @@ -529,27 +567,6 @@ */ protected abstract void processVersionRules(String token, MetaData metaData) throws Exception; -// { -// -// // Check existing version in storage -// MetaData previousVersion = getStorageEngine().getMetadata(token, -// metaData.getUuid(), metaData.getVersion()); -// /* -// * MetaData parentData = getStorageEngine().getElementVersion(metaData -// * .getParentData().getUuid(), metaData.getParentData() .getVersion()); -// * MetaData parentVersion = -// * getStorageEngine().getElementVersion(metaData -// * .getParentVersion().getUuid(), metaData.getParentVersion() -// * .getVersion()); -// */ -// -// // Version rules -// if (previousVersion != null) { -// metaData.setVersion(previousVersion.getVersion().incVersion(0) -// .toString()); -// } -// -// } /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.StorageService#getVersions(java.lang.String, java.lang.String) Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceServer.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceServer.java 2008-02-08 16:59:05 UTC (rev 762) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceServer.java 2008-02-08 17:16:27 UTC (rev 763) @@ -74,7 +74,8 @@ // Version rules if (previousVersion != null) { previousVersion.setLatest(false); - // getStorageEngine().update(previousVersion); + update(token, previousVersion.getUuid(), previousVersion + .getVersion(), previousVersion); metaData.setLatest(true); metaData.setVersion(previousVersion.getVersion().incVersion(0) Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementImport.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementImport.java 2008-02-08 16:59:05 UTC (rev 762) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementImport.java 2008-02-08 17:16:27 UTC (rev 763) @@ -17,12 +17,14 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.web.pages; +import org.apache.tapestry.annotations.InjectPage; import org.apache.tapestry.upload.services.UploadedFile; import com.healthmarketscience.rmiio.RemoteInputStreamServer; import com.healthmarketscience.rmiio.SimpleRemoteInputStream; import de.hsofttec.t5components.annotations.SetterGetter; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.ui.web.SimExplorerWebException; import fr.cemagref.simexplorer.is.ui.web.pages.security.UserPage; import fr.cemagref.simexplorer.is.ui.web.services.RemoteStorageService; @@ -40,30 +42,43 @@ @SetterGetter private UploadedFile _fileLib; + /** The element detail. */ + @InjectPage + private ElementDetail elementDetail; + /** * On success. + * + * @return the object */ - public void onSuccess() { + public Object onSuccess() { + MetaData mde = null; if (_fileEA != null) { RemoteInputStreamServer zipRemoteStream = new SimpleRemoteInputStream( _fileEA.getStream()); try { - RemoteStorageService.getStorageService().saveElement( + mde = RemoteStorageService.getStorageService().saveElement( getToken(), zipRemoteStream.export()); } catch (Exception e) { throw new SimExplorerWebException(e); } - } - if (_fileLib != null) { - RemoteInputStreamServer zipRemoteStream = new SimpleRemoteInputStream( - _fileLib.getStream()); - try { - RemoteStorageService.getStorageService().saveElement( - getToken(), zipRemoteStream.export()); - } catch (Exception e) { - throw new SimExplorerWebException(); + } else { + if (_fileLib != null) { + RemoteInputStreamServer zipRemoteStream = new SimpleRemoteInputStream( + _fileLib.getStream()); + try { + mde = RemoteStorageService.getStorageService().saveElement( + getToken(), zipRemoteStream.export()); + } catch (Exception e) { + throw new SimExplorerWebException(); + } } } + if (mde != null) { + elementDetail.setup(mde.getUuid(), mde.getVersion().toString()); + return elementDetail; + } + return this; } /* (non-Javadoc)

1 0

r762 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing
by tchemit＠users.labs.libre-entreprise.org Feb. 8, 2008

Feb. 8, 2008

Author: tchemit Date: 2008-02-08 16:59:05 +0000 (Fri, 08 Feb 2008) New Revision: 762 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java Log: clean 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-08 16:58:56 UTC (rev 761) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java 2008-02-08 16:59:05 UTC (rev 762) @@ -215,8 +215,7 @@ updateButton(ui.getExpandAllApplication(), enabled, tooltip); } - protected static void refreshDownloadLoggableElementAction(JApplicationDetailTab ui, DetailTabModel model, LoggableElementTreeNode node) { - //TODO Use model instead of ui + protected static void refreshDownloadLoggableElementAction(JApplicationDetailTab ui, DetailTabModel model, LoggableElementTreeNode node) { MetaData detail = model.getDetail(); boolean enabled = detail !=null || LoggableElementTreeHelper.canDownload(node); String tooltip = !enabled?null:_("simexplorer.action.dowloadLoggableElement2", detail==null?node.getUserObject():detail.getName()+" - "+model.getSelectedVersion());

1 0

r761 - trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab
by tchemit＠users.labs.libre-entreprise.org Feb. 8, 2008

Feb. 8, 2008

Author: tchemit Date: 2008-02-08 16:58:56 +0000 (Fri, 08 Feb 2008) New Revision: 761 Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx Log: clean 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-08 16:58:43 UTC (rev 760) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx 2008-02-08 16:58:56 UTC (rev 761) @@ -79,8 +79,7 @@ <row> <cell fill='horizontal' columns="2" insets='0,0,0,0'> <JScrollPane id='scrollAttachments' horizontalScrollBarPolicy='horizontal_scrollbar_as_needed' verticalScrollBarPolicy='vertical_scrollbar_as_needed'> -  - <JList id="detailAttachments" model='{new DefaultListModel()}'/> + <JList id="detailAttachments" model='{new DefaultListModel()}' selectionMode='0'/> </JScrollPane> </cell> </row>

1 0

r760 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions
by tchemit＠users.labs.libre-entreprise.org Feb. 8, 2008

Feb. 8, 2008

Author: tchemit Date: 2008-02-08 16:58:43 +0000 (Fri, 08 Feb 2008) New Revision: 760 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadLoggableElementAction.java Log: icons downloads Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java 2008-02-08 16:58:29 UTC (rev 759) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java 2008-02-08 16:58:43 UTC (rev 760) @@ -38,7 +38,7 @@ name = "simexplorer.action.application.downloadAttachment", shortDescription = "simexplorer.action.application.downloadAttachment.tooltip", longDescription = "simexplorer.action.application.downloadAttachment.help", - smallIcon = "action/download.png", + smallIcon = "action/downloadAttachment.png", mnemonic = 'x', hideActionText = true ) Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadLoggableElementAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadLoggableElementAction.java 2008-02-08 16:58:29 UTC (rev 759) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadLoggableElementAction.java 2008-02-08 16:58:43 UTC (rev 760) @@ -38,7 +38,7 @@ name = "simexplorer.action.application.downloadLoggableElement", shortDescription = "simexplorer.action.application.downloadLoggableElement.tooltip", longDescription = "simexplorer.action.application.downloadLoggableElement.help", - smallIcon = "action/download.png", + smallIcon = "action/downloadLoggableElement.png", mnemonic = 'x', hideActionText = true )

1 0

r759 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util
by tchemit＠users.labs.libre-entreprise.org Feb. 8, 2008

Feb. 8, 2008

Author: tchemit Date: 2008-02-08 16:58:29 +0000 (Fri, 08 Feb 2008) New Revision: 759 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractAction.java Log: passage en debug des log sur actions Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractAction.java 2008-02-08 16:58:09 UTC (rev 758) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractAction.java 2008-02-08 16:58:29 UTC (rev 759) @@ -42,14 +42,18 @@ public void actionPerformed(java.awt.event.ActionEvent e) { - log.info("------------------------------------------------------------"); - log.info("event : " + e); - log.info("source : " + e.getSource()); + log.debug("------------------------------------------------------------"); + log.debug("event : " + e); + log.debug("source : " + e.getSource()); try { boolean accepted = beforeAction(e); - log.info("action : " + this); - log.info("doAction : (" + accepted + ") : " + getActionName()); + log.debug("action : " + this); if (accepted) { + log.info(getActionName()+" (treate:" + accepted + ") : " + this); + } else { + log.debug(getActionName()+" (treate:" + accepted + ") : " + this); + } + if (accepted) { doAction(e); afterAction(e); }

1 0

r758 - trunk/simexplorer-is-swing/src/resources/icons/action
by tchemit＠users.labs.libre-entreprise.org Feb. 8, 2008

Feb. 8, 2008

Author: tchemit Date: 2008-02-08 16:58:09 +0000 (Fri, 08 Feb 2008) New Revision: 758 Added: trunk/simexplorer-is-swing/src/resources/icons/action/downloadAttachment.png trunk/simexplorer-is-swing/src/resources/icons/action/downloadLoggableElement.png Removed: trunk/simexplorer-is-swing/src/resources/icons/action/download.png Log: icons downloads Deleted: trunk/simexplorer-is-swing/src/resources/icons/action/download.png =================================================================== (Binary files differ) Added: trunk/simexplorer-is-swing/src/resources/icons/action/downloadAttachment.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/action/downloadAttachment.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/simexplorer-is-swing/src/resources/icons/action/downloadLoggableElement.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/action/downloadLoggableElement.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

1 0

r757 - trunk/simexplorer-is-swing/src/resources/i18n
by tchemit＠users.labs.libre-entreprise.org Feb. 8, 2008

Feb. 8, 2008

Author: tchemit Date: 2008-02-08 16:23:42 +0000 (Fri, 08 Feb 2008) New Revision: 757 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: mise en place listenersur liste 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-08 16:23:29 UTC (rev 756) +++ trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-08 16:23:42 UTC (rev 757) @@ -46,7 +46,7 @@ simexplorer.action.connect.help= simexplorer.action.connect.tooltip=Connect to remote server simexplorer.action.delete2=Delete ''{0}'' -simexplorer.action.dowloadAttachment2=Download attachment ''{0}'' +simexplorer.action.dowloadAttachment2=Download attachment ''{0}'' of ''{1}'' simexplorer.action.dowloadLoggableElement2=Download Loggable Element ''{0}'' simexplorer.action.export2=Export ''{0}'' simexplorer.action.help=Help 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-08 16:23:29 UTC (rev 756) +++ trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-08 16:23:42 UTC (rev 757) @@ -46,7 +46,7 @@ simexplorer.action.connect.help= simexplorer.action.connect.tooltip=Se connecter au serveur distant simexplorer.action.delete2=Supprimer ''{0}'' -simexplorer.action.dowloadAttachment2=T\u00E9l\u00E9charger le fichier attach\u00E9 ''{0}'' +simexplorer.action.dowloadAttachment2=T\u00E9l\u00E9charger le fichier attach\u00E9 ''{0}'' de''{1}'' simexplorer.action.dowloadLoggableElement2=T\u00E9l\u00E9charger le zip du Loggable Element ''{0}'' simexplorer.action.export2=Exporter ''{0}'' simexplorer.action.help=Aide

1 0

r756 - in trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing: . actions model
by tchemit＠users.labs.libre-entreprise.org Feb. 8, 2008

Feb. 8, 2008

Author: tchemit Date: 2008-02-08 16:23:29 +0000 (Fri, 08 Feb 2008) New Revision: 756 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 trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java Log: mise en place listenersur liste attachments 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-08 15:35:19 UTC (rev 755) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java 2008-02-08 16:23:29 UTC (rev 756) @@ -20,6 +20,7 @@ import fr.cemagref.simexplorer.is.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; +import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.ui.SimExplorer; @@ -188,17 +189,18 @@ * Rafraichit les actions d'un node dans l'arbre de navigation * * @param ui l'onglet de détail + * @param model le model de d'onglet detail * @param node le node sélectionné dans l'arbre de navigation */ - public static void refreshDetailActions(JApplicationDetailTab ui, LoggableElementTreeNode node) { + public static void refreshDetailActions(JApplicationDetailTab ui, DetailTabModel model, LoggableElementTreeNode node) { // refresh download LoggableElement button - refreshDownloadLoggableElementAction(ui, node); + refreshDownloadLoggableElementAction(ui, model,node); // refresh download Attachment button - refreshDownloadAttachmentAction(ui, node); + refreshDownloadAttachmentAction(ui, model); // refresh delete button - refreshDeleteAction(ui, node); + refreshDeleteAction(ui,model); // refresh export button - refreshExportAction(ui, node); + refreshExportAction(ui, model); // refresh tree buttons refreshTreeActions(ui, node); } @@ -213,29 +215,34 @@ updateButton(ui.getExpandAllApplication(), enabled, tooltip); } - protected static void refreshDownloadLoggableElementAction(JApplicationDetailTab ui, LoggableElementTreeNode node) { + protected static void refreshDownloadLoggableElementAction(JApplicationDetailTab ui, DetailTabModel model, LoggableElementTreeNode node) { //TODO Use model instead of ui - boolean enabled = LoggableElementTreeHelper.isLoggableElement(node) || LoggableElementTreeHelper.canDownload(node); - String tooltip = !enabled?null:_("simexplorer.action.dowloadLoggableElement2", node.getUserObject()); + MetaData detail = model.getDetail(); + boolean enabled = detail !=null || LoggableElementTreeHelper.canDownload(node); + String tooltip = !enabled?null:_("simexplorer.action.dowloadLoggableElement2", detail==null?node.getUserObject():detail.getName()+" - "+model.getSelectedVersion()); updateButton(ui.getDownloadLoggableElement(), enabled, tooltip); } - protected static void refreshDownloadAttachmentAction(JApplicationDetailTab ui, LoggableElementTreeNode node) { - //TODO Use model instead of ui - boolean enabled = LoggableElementTreeHelper.isLoggableElement(node); - String tooltip = !enabled?null:_("simexplorer.action.dowloadAttachment2", node.getUserObject()); + public static void refreshDownloadAttachmentAction(JApplicationDetailTab ui, DetailTabModel model) { + Attachment attachment = model.getSelectedAttachment(); + MetaData detail = model.getDetail(); + boolean enabled = detail!=null && attachment !=null; + String tooltip = !enabled?null:_("simexplorer.action.dowloadAttachment2", attachment,detail.getName()+" - "+model.getSelectedVersion()); updateButton(ui.getDownloadAttachment(), enabled, tooltip); } - protected static void refreshDeleteAction(JApplicationDetailTab ui, LoggableElementTreeNode node) { - boolean enabled = LoggableElementTreeHelper.canDelete(node); - String tooltip = !enabled?null:_("simexplorer.action.delete2", node.getUserObject()); + protected static void refreshDeleteAction(JApplicationDetailTab ui, DetailTabModel model) { + MetaData detail = model.getDetail(); + boolean enabled = detail!=null; + String tooltip = !enabled?null:_("simexplorer.action.delete2", detail.getName()+" - "+model.getSelectedVersion()); updateButton(ui.getDelete(), enabled, tooltip); } - protected static void refreshExportAction(JApplicationDetailTab ui, LoggableElementTreeNode node) { - boolean enabled = LoggableElementTreeHelper.canExport(node); - String tooltip = !enabled?null:_("simexplorer.action.export2", node.getUserObject()); + protected static void refreshExportAction(JApplicationDetailTab ui, DetailTabModel model) { + MetaData detail = model.getDetail(); + LoggableElement sNode = model.getSelectedNode(); + boolean enabled = sNode!=null && sNode instanceof ExplorationApplication; + String tooltip = !enabled?null:_("simexplorer.action.export2", detail.getName()+" - "+model.getSelectedVersion()); updateButton(ui.getExportApplication(), enabled, tooltip); } 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-08 15:35:19 UTC (rev 755) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java 2008-02-08 16:23:29 UTC (rev 756) @@ -17,6 +17,7 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.actions; +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; @@ -24,11 +25,13 @@ import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUIRefreshHelper; import fr.cemagref.simexplorer.is.ui.swing.actions.util.ShowTabAbstractAction; import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; +import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeHelper; import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode; import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationDetailTab; import javax.swing.DefaultComboBoxModel; -import javax.swing.DefaultListModel; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; import javax.swing.tree.TreePath; @@ -63,17 +66,22 @@ VersionSelectionListener versionListener; + AttachmentSelectionListener attachmentListener; + public ShowDetailTabAction(String name) { super(name); navigationListener = new NavigationSelectionListener(); versionListener = new VersionSelectionListener(); + attachmentListener = new AttachmentSelectionListener(); } protected void initFirstUsage(final JApplicationDetailTab ui, final DetailTabModel model) { // add a listener on navigation tree ui.getNavigationTree().addTreeSelectionListener(navigationListener); - // add a listener on version list + // add a listener on versions list ui.getDetailVersions().addItemListener(versionListener); + // add a listener on attachments list + ui.getDetailAttachments().addListSelectionListener(attachmentListener); } protected void initUI(JApplicationDetailTab ui, DetailTabModel model) { @@ -87,14 +95,11 @@ */ protected class NavigationSelectionListener implements TreeSelectionListener, PropertyChangeListener { - public NavigationSelectionListener() { - // only listen on SELECTED_VERSION_INDEX_PROPERTY_CHANGED - // to rebuild detail panel + public NavigationSelectionListener() { getTabModel().addPropertyChangeListener(DetailTabModel.Properties.SELECTED_NODE_PROPERTY_CHANGED, this); } public void valueChanged(TreeSelectionEvent e) { - JApplicationDetailTab ui = getTabUI(); DetailTabModel model = getTabModel(); TreePath path = e.getNewLeadSelectionPath(); @@ -114,13 +119,16 @@ LoggableElement element = node == null || !(node.getUserObject() instanceof LoggableElement) ? null : ((LoggableElement) node.getUserObject()); boolean history = element != null; Version selectedVersion; + Integer selectedAttachment; Version[] versions; if (!history) { versions = null; selectedVersion = null; + selectedAttachment=null; } else { versions = StorageServiceHelper.getVersions(getContext(), model.isRemote(), element.getMetaData().getUuid()); selectedVersion = element.getMetaData().getVersion(); + selectedAttachment=element.getMetaData().getAttachments().isEmpty()?null:0; } model.setVersions(versions); @@ -132,8 +140,9 @@ // on positionne la version selectionnee model.setSelectedVersion(selectedVersion); - // update actions on selected node - SimExplorerUIRefreshHelper.refreshDetailActions(ui, node); + // on positionne l'attachment selectionne + model.setSelectedAttachmentIndex(selectedAttachment); + } /** @@ -150,12 +159,18 @@ DefaultComboBoxModel historyModel = (DefaultComboBoxModel) ui.getDetailVersions().getModel(); boolean wasEnable = versionListener.isEnabled(); + boolean wasEnable2 = attachmentListener.isEnabled(); // disable version listener on selection (we already have updated model) versionListener.setEnabled(false); + attachmentListener.setEnabled(false); // refresh ui SimExplorerUIRefreshHelper.resetHistory(ui, model, historyModel); // push back previous state of version listener versionListener.setEnabled(wasEnable); + attachmentListener.setEnabled(wasEnable2); + // update actions on toolbar + LoggableElementTreeNode node = LoggableElementTreeHelper.getSelectedNodeOrRootNode(ui.getNavigationTree()); + SimExplorerUIRefreshHelper.refreshDetailActions(ui, model, node); } } @@ -182,18 +197,25 @@ if (selectedItem == null) { throw new NullPointerException("can not have a selectedItem null"); } + Integer selectedAttachment; Version selectedVersion = Version.valueOf(selectedItem.toString()); - log.debug("selected version (" + selectedVersion+ ") " + selectedItem); + log.debug("selected version (" + selectedVersion + ") " + selectedItem); metas = StorageServiceHelper.getMetaData( getContext(), model.isRemote(), model.getSelectedNode().getMetaData().getUuid(), selectedVersion.toString() ); + + selectedAttachment=metas.getAttachments().isEmpty()?null:0; + model.setDetail(metas); // finally change selectedIndex model.setSelectedVersion(selectedVersion); + + // on positionne l'attachment selectionne + model.setSelectedAttachmentIndex(selectedAttachment); } /** @@ -210,16 +232,24 @@ DetailTabModel model = getTabModel(); LoggableElement selectedNode = model.getSelectedNode(); boolean wasEnable = isEnabled(); + boolean wasEnable2 = attachmentListener.isEnabled(); // disable this listener, while updating list model, it will // change the selection, and we don't want the model to be updated // again setEnabled(false); + attachmentListener.setEnabled(false); + if (index == null || index == -1) { SimExplorerUIRefreshHelper.resetDetailPanel(ui); } else { SimExplorerUIRefreshHelper.updateDetailPanel(index, ui, model, selectedNode); } setEnabled(wasEnable); + attachmentListener.setEnabled(wasEnable2); + ui.getDetailAttachments().setSelectedIndex(0); + // update actions on toolbar + LoggableElementTreeNode node = LoggableElementTreeHelper.getSelectedNodeOrRootNode(ui.getNavigationTree()); + SimExplorerUIRefreshHelper.refreshDetailActions(ui, model, node); } public boolean isEnabled() { @@ -232,4 +262,59 @@ } + private class AttachmentSelectionListener implements PropertyChangeListener, ListSelectionListener { + + protected boolean enabled; + + public AttachmentSelectionListener() { + enabled = true; + getTabModel().addPropertyChangeListener(DetailTabModel.Properties.SELECTED_ATTACHMENT_INDEX_PROPERTY_CHANGED, this); + } + + public void valueChanged(ListSelectionEvent e) { + if (!isEnabled()) { + return; + } + JApplicationDetailTab ui = getTabUI(); + DetailTabModel model = getTabModel(); + Object selectedItem = ui.getDetailAttachments().getSelectedValue(); + if (selectedItem == null) { + throw new NullPointerException("can not have a attachment null"); + } + Attachment attachment = (Attachment) selectedItem; + log.debug("selected attachment (" + attachment + ") " + selectedItem); + + // finally change selectedIndex + model.setSelectedAttachmentIndex(ui.getDetailAttachments().getSelectedIndex()); + } + + /** + * When the model modifies his data, ui must be updated. + * <p/> + * Note : <b>Only used when the selectedVersion is not null.</b> + * + * @param evt property changed event + */ + public void propertyChange(PropertyChangeEvent evt) { + log.debug(evt.getPropertyName() + " old:" + evt.getOldValue() + ", new:" + evt.getNewValue()); + JApplicationDetailTab ui = getTabUI(); + DetailTabModel model = getTabModel(); + boolean wasEnable = isEnabled(); + // disable this listener, while updating list model, it will + // change the selection, and we don't want the model to be updated + // again + setEnabled(false); + SimExplorerUIRefreshHelper.refreshDownloadAttachmentAction(ui, model); + setEnabled(wasEnable); + } + + public boolean isEnabled() { + return enabled; + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + } + } 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-08 15:35:19 UTC (rev 755) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java 2008-02-08 16:23:29 UTC (rev 756) @@ -75,6 +75,7 @@ * si la liste des versions est nulle) */ protected Integer selectedVersionIndex; + /** * l'index de l'attachment sélectionné dans la liste des attachments (ou * null si pas liste vide) @@ -87,11 +88,11 @@ */ protected MetaData detail; - public String getName() { return tab.name(); } + public boolean isRemote() { return remote; } @@ -112,7 +113,7 @@ return selectedAttachmentIndex; } - public Attachment getAttachment() { + public Attachment getSelectedAttachment() { return selectedAttachmentIndex == null || selectedAttachmentIndex == -1 ? null : getDetail().getAttachment(selectedAttachmentIndex); } @@ -158,7 +159,7 @@ public void setSelectedAttachmentIndex(Integer selectedAttachmentIndex) { Integer oldSelectedAttachmentIndex = this.selectedAttachmentIndex; this.selectedAttachmentIndex = selectedAttachmentIndex; - // ui must update detail panel for the selected node and version + // ui must update button downloadAttachment accessibility firePropertyChange(Properties.SELECTED_ATTACHMENT_INDEX_PROPERTY_CHANGED, oldSelectedAttachmentIndex, selectedAttachmentIndex); } @@ -192,11 +193,11 @@ versions = null; resetSelectedVersion(); detail = null; - selectedAttachmentIndex=null; } public void resetSelectedVersion() { selectedVersionIndex = null; + selectedAttachmentIndex=null; } protected PropertyChangeSupport changeSupport;

1 0