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

r755 - 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 15:35:19 +0000 (Fri, 08 Feb 2008) New Revision: 755 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: downloads 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 15:35:03 UTC (rev 754) +++ trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-08 15:35:19 UTC (rev 755) @@ -7,15 +7,20 @@ simexplorer.action.application.collapseAll=collapseAll simexplorer.action.application.collapseAll.help= simexplorer.action.application.collapseAll.tooltip=Collapse all nodes +simexplorer.action.application.collapseAll2= simexplorer.action.application.delete=Delete simexplorer.action.application.delete.help= simexplorer.action.application.delete.tooltip=Delete selected item -simexplorer.action.application.download=Download -simexplorer.action.application.download.help= -simexplorer.action.application.download.tooltip=Click here to download the library or the result +simexplorer.action.application.downloadAttachment=Download Attachment +simexplorer.action.application.downloadAttachment.help= +simexplorer.action.application.downloadAttachment.tooltip=Click here to download the attachment +simexplorer.action.application.downloadLoggableElement=Download Loggable Element +simexplorer.action.application.downloadLoggableElement.help= +simexplorer.action.application.downloadLoggableElement.tooltip=Click here to download the complete loggable element as a Zip simexplorer.action.application.expandAll=expandAll simexplorer.action.application.expandAll.help=Expand all nodes simexplorer.action.application.expandAll.tooltip= +simexplorer.action.application.expandAll2.tooltip=Expand all nodes of ''{0}'' simexplorer.action.application.export=export simexplorer.action.application.export.help= simexplorer.action.application.export.tooltip=Export application @@ -41,7 +46,8 @@ simexplorer.action.connect.help= simexplorer.action.connect.tooltip=Connect to remote server simexplorer.action.delete2=Delete ''{0}'' -simexplorer.action.dowload2=Download ''{0}'' +simexplorer.action.dowloadAttachment2=Download attachment ''{0}'' +simexplorer.action.dowloadLoggableElement2=Download Loggable Element ''{0}'' simexplorer.action.export2=Export ''{0}'' simexplorer.action.help=Help simexplorer.action.help.help= @@ -152,6 +158,7 @@ simexplorer.node.detail=Detail of ''{0}'' [{1}] simexplorer.node.explorations=Exlorations simexplorer.node.libraries=Librairies +simexplorer.node.navigation=Navigation tree simexplorer.node.noattachments=No attachment simexplorer.node.nodetail=No detail simexplorer.node.structures=Structures 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 15:35:03 UTC (rev 754) +++ trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-08 15:35:19 UTC (rev 755) @@ -7,15 +7,20 @@ simexplorer.action.application.collapseAll=tout r\u00E9duire simexplorer.action.application.collapseAll.help= simexplorer.action.application.collapseAll.tooltip=R\u00E9duire tous les noeuds +simexplorer.action.application.collapseAll2= simexplorer.action.application.delete=Supprimer simexplorer.action.application.delete.help= simexplorer.action.application.delete.tooltip=Supprimer l'\u00E9l\u00E9ment s\u00E9lectionn\u00E9 -simexplorer.action.application.download=T\u00E9l\u00E9charger -simexplorer.action.application.download.help= -simexplorer.action.application.download.tooltip=Cliquer pour t\u00E9l\u00E9charger la librairie ou le r\u00E9sultat +simexplorer.action.application.downloadAttachment=T\u00E9l\u00E9charger le fichier attach\u00E9 +simexplorer.action.application.downloadAttachment.help= +simexplorer.action.application.downloadAttachment.tooltip=Cliquer ici pour t\u00E9l\u00E9charger le fichier attach\u00E9 +simexplorer.action.application.downloadLoggableElement=T\u00E9l\u00E9charger le zip +simexplorer.action.application.downloadLoggableElement.help= +simexplorer.action.application.downloadLoggableElement.tooltip=Cliquer ici pour t\u00E9l\u00E9charger le Zip du LoggableElement simexplorer.action.application.expandAll=tout d\u00E9rouler simexplorer.action.application.expandAll.help= simexplorer.action.application.expandAll.tooltip=\u00E9taler tous les noeuds +simexplorer.action.application.expandAll2.tooltip=\u00E9taler tous les noeuds de ''{0}'' simexplorer.action.application.export=exporter simexplorer.action.application.export.help= simexplorer.action.application.export.tooltip=Exporter une application @@ -41,7 +46,8 @@ simexplorer.action.connect.help= simexplorer.action.connect.tooltip=Se connecter au serveur distant simexplorer.action.delete2=Supprimer ''{0}'' -simexplorer.action.dowload2=T\u00E9l\u00E9charger ''{0}'' +simexplorer.action.dowloadAttachment2=T\u00E9l\u00E9charger le fichier attach\u00E9 ''{0}'' +simexplorer.action.dowloadLoggableElement2=T\u00E9l\u00E9charger le zip du Loggable Element ''{0}'' simexplorer.action.export2=Exporter ''{0}'' simexplorer.action.help=Aide simexplorer.action.help.help= @@ -152,6 +158,7 @@ simexplorer.node.detail=D\u00E9tail de ''{0}'' [{1}] simexplorer.node.explorations=Exlorations simexplorer.node.libraries=Librairies +simexplorer.node.navigation=Navigation simexplorer.node.noattachments=Pas de fichier attach\u00E9 simexplorer.node.nodetail=Pas de d\u00E9tail simexplorer.node.structures=Structures

1 0

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

Feb. 8, 2008

Author: tchemit Date: 2008-02-08 15:35:03 +0000 (Fri, 08 Feb 2008) New Revision: 754 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockDatabase.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java Log: logger Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockDatabase.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockDatabase.java 2008-02-08 15:15:27 UTC (rev 753) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockDatabase.java 2008-02-08 15:35:03 UTC (rev 754) @@ -35,6 +35,9 @@ import java.util.SortedMap; import java.util.TreeMap; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + /** * Classe permettant de créer une base fictive * @@ -44,6 +47,8 @@ static final int SIZE = 10; + static protected Log log = LogFactory.getLog(MockDatabase.class); + /** * le dictionnaire d'ea indexées par leur uuid. * Le premier ea est le parent (donc la version la plus petite) @@ -117,9 +122,9 @@ } registerEA(uuid, listSons.toArray(new ExplorationApplication[listSons.size()])); } - System.out.println("nb ExplorationApplications : "+eas.size()); - System.out.println("nb LoggableElements : "+loggableElements.size()); - System.out.println("nb MetaDatas : "+metadatas.size()); + log.info("nb ExplorationApplications : "+eas.size()); + log.info("nb LoggableElements : "+loggableElements.size()); + log.info("nb MetaDatas : "+metadatas.size()); } protected void registerEA(String uuid, ExplorationApplication... eas) throws Exception { 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-08 15:15:27 UTC (rev 753) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-02-08 15:35:03 UTC (rev 754) @@ -161,7 +161,7 @@ ElementGenerator.RandomStream stream = base.generateTextStream(); String md5 = stream.getMd5(); attachment.setDataHash(md5); - System.out.println("setMd5 "+ md5+" for "+element); + MockDatabase.log.info("setMd5 "+ md5+" for "+element); return stream.getStream(); } catch (Exception e) { throw new SimExplorerServiceException(e); @@ -202,7 +202,7 @@ int start, int count, int dateOrder) throws SimExplorerServiceException { int last = start + count; - System.out.println("ask data from " + start + " width:" + count); + MockDatabase.log.info("ask data from " + start + " width:" + count); SortedMap<String, MetaData[]> map = base.metadatas; if (last > map.size()) { last = map.size(); @@ -248,11 +248,9 @@ /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.StorageService#loginUser(java.lang.String, java.lang.String) */ - public String loginUser(String login, String password) - throws SimExplorerServiceException { + public String loginUser(String login, String password) throws SimExplorerServiceException { if (login == null) { - throw new SimExplorerServiceException(new NullPointerException( - "login can not be null")); + throw new SimExplorerServiceException(new NullPointerException("login can not be null")); } return "password"; }

1 0

r753 - 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 15:15:27 +0000 (Fri, 08 Feb 2008) New Revision: 753 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java Log: downloads + refactor 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:15:03 UTC (rev 752) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java 2008-02-08 15:15:27 UTC (rev 753) @@ -44,6 +44,7 @@ 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; @@ -190,42 +191,52 @@ * @param node le node sélectionné dans l'arbre de navigation */ public static void refreshDetailActions(JApplicationDetailTab ui, LoggableElementTreeNode node) { - // refresh download button - refreshDownloadAction(ui, node); + // refresh download LoggableElement button + refreshDownloadLoggableElementAction(ui, node); + // refresh download Attachment button + refreshDownloadAttachmentAction(ui, node); // refresh delete button refreshDeleteAction(ui, node); // refresh export button refreshExportAction(ui, node); + // refresh tree buttons + refreshTreeActions(ui, node); } - protected static void refreshDownloadAction(JApplicationDetailTab ui, LoggableElementTreeNode node) { - boolean download = LoggableElementTreeHelper.canDownload(node); - ui.getDownload().setEnabled(download); - String tooltip = null; - if (download) { - tooltip = _("simexplorer.action.dowload2", node.getUserObject()); - } - ui.getDownload().setToolTipText(tooltip); + 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()); + updateButton(ui.getCollapseAllApplication(), enabled, tooltip); + tooltip = !enabled?null: _("simexplorer.action.application.expandAll2.tooltip", node.getUserObject()); + updateButton(ui.getExpandAllApplication(), enabled, tooltip); } + protected static void refreshDownloadLoggableElementAction(JApplicationDetailTab ui, 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()); + 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()); + updateButton(ui.getDownloadAttachment(), enabled, tooltip); + } + protected static void refreshDeleteAction(JApplicationDetailTab ui, LoggableElementTreeNode node) { - boolean delete = LoggableElementTreeHelper.canDelete(node); - ui.getDelete().setEnabled(delete); - String tooltip = null; - if (delete) { - tooltip = _("simexplorer.action.delete2", node.getUserObject()); - } - ui.getDelete().setToolTipText(tooltip); + boolean enabled = LoggableElementTreeHelper.canDelete(node); + String tooltip = !enabled?null:_("simexplorer.action.delete2", node.getUserObject()); + updateButton(ui.getDelete(), enabled, tooltip); } protected static void refreshExportAction(JApplicationDetailTab ui, LoggableElementTreeNode node) { - boolean export = LoggableElementTreeHelper.canExport(node); - ui.getExportApplication().setEnabled(export); - String tooltip = null; - if (export) { - tooltip = _("simexplorer.action.export2", node.getUserObject()); - } - ui.getExportApplication().setToolTipText(tooltip); + boolean enabled = LoggableElementTreeHelper.canExport(node); + String tooltip = !enabled?null:_("simexplorer.action.export2", node.getUserObject()); + updateButton(ui.getExportApplication(), enabled, tooltip); } protected static void refreshPagination(JApplicationListTab ui, PaginationModel pagination) { @@ -267,6 +278,11 @@ ui.getCurrentPage().setEnabled(b); } + protected static void updateButton(JButton button, boolean enabled, String tooltip) { + button.setEnabled(enabled); + button.setToolTipText(tooltip); + } + public static void resetHistory(JApplicationDetailTab ui, DetailTabModel model, DefaultComboBoxModel historyModel) { historyModel.removeAllElements(); LoggableElement selectedNode = model.getSelectedNode(); @@ -333,10 +349,8 @@ listModel.setSize(0); 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); + ui.getDetailAttachmentsHeader().setText(_("simexplorer.node.noattachments")); + ui.getScrollAttachments().setVisible(false); } else { ui.getDetailAttachmentsHeader().setText(_("simexplorer.node.attachments", attachments.size())); for (Attachment attachment : attachments) { @@ -347,16 +361,15 @@ if (nbRows > 5) { nbRows = 5; } - Dimension dimHead = ui.getDetailHeaderAttachmentsPanel().getPreferredSize(); - listAttachments.setVisible(true); + //Dimension dimHead = ui.getDetailHeaderAttachmentsPanel().getPreferredSize(); + ui.getScrollAttachments().setVisible(true); 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))); + ui.getScrollAttachments().setPreferredSize(new Dimension((int) rect.getWidth()-4, (int) (3+ nbRows * rect.getHeight()))); } table.invalidate(); listAttachments.invalidate(); - ui.getScrollPane().repaint(); + ui.getScrollPane().invalidate(); ui.repaint(); }

1 0

r752 - 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 15:15:03 +0000 (Fri, 08 Feb 2008) New Revision: 752 Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx Log: actions plus associ?\195?\169es ?\195?\160 la navigation mais au tab entier (navigation + detail) 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 15:14:27 UTC (rev 751) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx 2008-02-08 15:15:03 UTC (rev 752) @@ -2,36 +2,23 @@ <script> import static org.codelutin.i18n.I18n._; </script> - <row> - <cell fill='vertical'> + <row insets='2,2,0,0'> + <cell fill='horizontal'> <JToolBar id='toolbar' floatable='false' opaque='false' margin='0,0,0,0' borderPainted='false'> <JButton id='collapseAllApplication' enabled='false'/> <JButton id='expandAllApplication' enabled='false'/> <JButton id='exportApplication' enabled='false'/> - <JButton id='download' enabled='false'/> + <JButton id='downloadLoggableElement' enabled='false'/> + <JButton id='downloadAttachment' enabled='false'/> <JButton id='delete' enabled='false'/> </JToolBar> </cell> </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> - </cell> - </row> - <row> - <cell fill='vertical'> - <JPanel id='detailHeaderAttachmentsPanel' background='{Color.WHITE}' border='{javax.swing.border.LineBorder.createBlackLineBorder()}'> - <JLabel id='detailAttachmentsHeader' text='{_("simexplorer.node.noattachments")}'/> - </JPanel> - </cell> - </row> <row fill="both" weightx="1" weighty="1"> <cell> <JSplitPane id='splitOne' orientation="horizontal" resizeWeight="0.4" oneTouchExpandable='true'> - <JScrollPane columnHeaderView='{toolbar}'> + <JScrollPane columnHeaderView='{navigationHeaderPanel}'> <JTree id="navigationTree" model='{new javax.swing.tree.DefaultTreeModel(null)}'/> </JScrollPane> <JScrollPane id="scrollPane" columnHeaderView='{detailHeaderPanel}' border='{null}' horizontalScrollBarPolicy='horizontal_scrollbar_never' verticalScrollBarPolicy='vertical_scrollbar_never'> @@ -69,23 +56,30 @@ </cell> </row> <row> - <cell fill='both' columns="2"> - <JPanel id='detailDescriptorsHeaderPanel' background='{Color.WHITE}' border='{javax.swing.border.LineBorder.createBlackLineBorder()}'> + <cell fill='horizontal' columns="2" insets='5,0,0,1'> + <JPanel id='detailDescriptorsHeaderPanel' border='{javax.swing.border.LineBorder.createBlackLineBorder()}'> <JLabel id='detailDescriptorsHeader'/> </JPanel> </cell> </row> <row> - <cell fill='horizontal' columns="2"> - <JScrollPane id='scrollTable' horizontalScrollBarPolicy='horizontal_scrollbar_as_needed' verticalScrollBarPolicy='vertical_scrollbar_as_needed'> - <JTable id="detailTable" model='{new fr.cemagref.simexplorer.is.ui.swing.model.JDetailTableModel()}' - focusable='false' enabled='false'/> + <cell fill='horizontal' columns="2" insets='0,0,0,0'> + <JScrollPane id='scrollTable' border='{null}' horizontalScrollBarPolicy='horizontal_scrollbar_as_needed' verticalScrollBarPolicy='vertical_scrollbar_as_needed'> + <JTable id="detailTable" border='{null}' model='{new fr.cemagref.simexplorer.is.ui.swing.model.JDetailTableModel()}' focusable='false' enabled='false' /> </JScrollPane> </cell> </row> <row> - <cell fill='horizontal' columns="2"> - <JScrollPane id='scrollAttachments' columnHeaderView='{detailHeaderAttachmentsPanel}' horizontalScrollBarPolicy='horizontal_scrollbar_as_needed' verticalScrollBarPolicy='vertical_scrollbar_as_needed'> + <cell fill="horizontal" columns="2" insets='5,0,0,1' > + <JPanel id='detailHeaderAttachmentsPanel' border='{javax.swing.border.LineBorder.createBlackLineBorder()}'> + <JLabel id='detailAttachmentsHeader' text='{_("simexplorer.node.noattachments")}'/> + </JPanel> + </cell> + </row> + <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()}'/> </JScrollPane> </cell> @@ -97,6 +91,20 @@ </JPanel> </cell> </row> + <row> + <cell> + <JPanel id='detailHeaderPanel' background='{Color.WHITE}' border='{javax.swing.border.LineBorder.createBlackLineBorder()}'> + <JLabel id='detailHeader' text='{_("simexplorer.node.nodetail")}'/> + </JPanel> + </cell> + </row> + <row> + <cell> + <JPanel id='navigationHeaderPanel' border='{javax.swing.border.LineBorder.createBlackLineBorder()}'> + <JLabel id='navigationHeader' text='{_("simexplorer.node.navigation")}'/> + </JPanel> + </cell> + </row> </Table> </JScrollPane> </JSplitPane>

1 0

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

Feb. 8, 2008

Author: tchemit Date: 2008-02-08 15:14:27 +0000 (Fri, 08 Feb 2008) New Revision: 751 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java Log: downloads + encapsulation exception TODO gerer graphiquement les erreurs Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java 2008-02-08 15:13:57 UTC (rev 750) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java 2008-02-08 15:14:27 UTC (rev 751) @@ -1,5 +1,5 @@ /* -* \#\#% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, * Tony Chemit, Gabriel Landais * * This program is free software; you can redistribute it and/or @@ -15,81 +15,158 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* \#\#% */ +* ##% */ package fr.cemagref.simexplorer.is.ui; +import com.healthmarketscience.rmiio.RemoteInputStream; +import com.healthmarketscience.rmiio.RemoteInputStreamClient; +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; +import fr.cemagref.simexplorer.is.service.MockStorageServiceImpl; import fr.cemagref.simexplorer.is.service.SimExplorerServiceException; import fr.cemagref.simexplorer.is.service.StorageService; +import java.io.BufferedInputStream; +import java.io.IOException; +import java.io.InputStream; + /** - * Une classe pour encapsuler les appels aux services Sotrage + * Une classe pour encapsuler les appels aux services Storage * * @author chemit */ public class StorageServiceHelper { - public static int getCount(SimExplorerContext context, boolean remote, String query, boolean onlyLatest) throws Exception { - StorageService service = context.getStorageService(remote); + public static int getCount(SimExplorerContext context, boolean remote, String query, boolean onlyLatest) { + StorageService service = getService(context, remote); String token = context.getToken(); int size; - if (query == null || query.isEmpty()) { - size = service.findApplicationsCount(token, onlyLatest); - } else { - size = service.findFullTextCount(token, query, onlyLatest); + try { + if (query == null || query.isEmpty()) { + size = service.findApplicationsCount(token, onlyLatest); + } else { + size = service.findFullTextCount(token, query, onlyLatest); + } + return size; + } catch (SimExplorerServiceException e) { + throw new SimExplorerRuntimeException(e); } - return size; } - public static MetaData[] getData(SimExplorerContext context, boolean remote, boolean onlyLatest, String query, long newFirstIndex, int width, int rowOrder) throws Exception { - StorageService service = context.getStorageService(remote); + public static MetaData[] getData(SimExplorerContext context, boolean remote, boolean onlyLatest, String query, long newFirstIndex, int width, int rowOrder) { + StorageService service = getService(context, remote); String token = context.getToken(); - MetaData[] data; - if (query == null || query.isEmpty()) { - data = service.findApplications(token, onlyLatest, (int) newFirstIndex, width, rowOrder); - } else { - data = service.findFullText(token, query, onlyLatest, (int) newFirstIndex, width, rowOrder); + try { + MetaData[] data; + if (query == null || query.isEmpty()) { + data = service.findApplications(token, onlyLatest, (int) newFirstIndex, width, rowOrder); + } else { + data = service.findFullText(token, query, onlyLatest, (int) newFirstIndex, width, rowOrder); + } + return data; + } catch (SimExplorerServiceException e) { + throw new SimExplorerRuntimeException(e); } - return data; } - public static LoggableElement getElement(SimExplorerContext context, boolean remote, String uuid, String version) throws Exception { - StorageService service = context.getStorageService(remote); - LoggableElement data; - data = service.getLoggableElement(context.getToken(), uuid, version); - return data; + public static LoggableElement getElement(SimExplorerContext context, boolean remote, String uuid, String version) { + try { + LoggableElement data; + data = getService(context, remote).getLoggableElement(context.getToken(), uuid, version); + return data; + } catch (SimExplorerServiceException e1) { + throw new SimExplorerRuntimeException(e1); + } } - public static Version[] getVersions(SimExplorerContext context, boolean remote, String uuid) { - StorageService service = context.getStorageService(remote); - MetaData[] data; + public static MetaData getMetaData(SimExplorerContext context, boolean remote, String uuid, String version) { try { - data = service.getVersions(context.getToken(), uuid); - } catch (SimExplorerServiceException e) { - throw new SimExplorerRuntimeException(e); + MetaData metas; + metas = getService(context, remote).getMetadata(context.getToken(), uuid, version); + return metas; + } catch (SimExplorerServiceException e1) { + throw new SimExplorerRuntimeException(e1); } - if (data == null) { - return null; + } + + public static BufferedInputStream downloadElementFull(SimExplorerContext context, boolean remote, String uuid, String version) { + try { + + InputStream stream = ((MockStorageServiceImpl) getService(context, remote)).downloadElementFull(context.getToken(), uuid, version); + BufferedInputStream bis; + bis = new BufferedInputStream(stream); + return bis; + } catch (SimExplorerServiceException e1) { + throw new SimExplorerRuntimeException(e1); } - Version[] result = new Version[data.length]; - for (int i = 0; i < data.length; i++) { - MetaData metaData = data[i]; - result[i] = metaData.getVersion(); + } + + public static BufferedInputStream downloadElementData(SimExplorerContext context, boolean remote, String uuid, String version, Attachment attachment) { + try { + InputStream stream = ((MockStorageServiceImpl) getService(context, remote)).downloadElementData(context.getToken(), uuid, version, attachment); + BufferedInputStream bis; + bis = new BufferedInputStream(stream); + return bis; + } catch (SimExplorerServiceException e1) { + throw new SimExplorerRuntimeException(e1); } - return result; } - public static MetaData getMetaData(SimExplorerContext context, boolean remote, String uuid, String version) { + + public static BufferedInputStream retrieveElementFull(SimExplorerContext context, boolean remote, String uuid, String version) { try { - StorageService service = context.getStorageService(remote); - MetaData metas; - metas = service.getMetadata(context.getToken(), uuid, version); - return metas; + RemoteInputStream ris; + ris = getService(context, remote).retrieveElementFull(context.getToken(), uuid, version); + InputStream stream = RemoteInputStreamClient.wrap(ris); + BufferedInputStream bis; + bis = new BufferedInputStream(stream); + return bis; } catch (SimExplorerServiceException e1) { throw new SimExplorerRuntimeException(e1); + } catch (IOException e) { + throw new SimExplorerRuntimeException(e); } } + + public static BufferedInputStream retrieveElementData(SimExplorerContext context, boolean remote, String uuid, String version, Attachment attachment) { + try { + RemoteInputStream ris; + ris = getService(context, remote).retrieveElementData(context.getToken(), uuid, version, attachment); + InputStream stream = RemoteInputStreamClient.wrap(ris); + BufferedInputStream bis; + bis = new BufferedInputStream(stream); + return bis; + } catch (SimExplorerServiceException e1) { + throw new SimExplorerRuntimeException(e1); + } catch (IOException e) { + throw new SimExplorerRuntimeException(e); + } + } + + public static Version[] getVersions(SimExplorerContext context, boolean remote, String uuid) { + try { + MetaData[] data; + data = getService(context, remote).getVersions(context.getToken(), uuid); + if (data == null) { + return null; + } + Version[] result = new Version[data.length]; + for (int i = 0; i < data.length; i++) { + MetaData metaData = data[i]; + result[i] = metaData.getVersion(); + } + return result; + } catch (SimExplorerServiceException e) { + throw new SimExplorerRuntimeException(e); + } + } + + protected static StorageService getService(SimExplorerContext context, boolean remote) { + StorageService service; + service = context.getStorageService(remote); + return service; + } }

1 0

r750 - 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 15:13:57 +0000 (Fri, 08 Feb 2008) New Revision: 750 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportApplicationAction.java Log: on utilise pas directement le service dans les actions, on passe par le helper Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportApplicationAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportApplicationAction.java 2008-02-08 15:13:34 UTC (rev 749) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportApplicationAction.java 2008-02-08 15:13:57 UTC (rev 750) @@ -20,9 +20,7 @@ import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.Version; -import fr.cemagref.simexplorer.is.service.StorageService; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; -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; @@ -83,9 +81,7 @@ super.doAction(e); //TODO Where to save (if local to remote and vice-versa ?) - StorageService service = getContext().getStorageService(((DetailTabModel) getModel()).isRemote()); - //service.exportElement(getContext().getToken(), null, uuid, version.toString()); } @Override

1 0

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

Feb. 8, 2008

Author: tchemit Date: 2008-02-08 15:13:34 +0000 (Fri, 08 Feb 2008) New Revision: 749 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java Log: ajout des attachments dans le modele 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:12:06 UTC (rev 748) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java 2008-02-08 15:13:34 UTC (rev 749) @@ -22,6 +22,7 @@ import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; +import fr.cemagref.simexplorer.is.attachment.Attachment; import jaxx.runtime.builder.TabModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -42,7 +43,8 @@ public enum Properties { SELECTED_NODE_PROPERTY_CHANGED, - SELECTED_VERSION_INDEX_PROPERTY_CHANGED + SELECTED_VERSION_INDEX_PROPERTY_CHANGED, + SELECTED_ATTACHMENT_INDEX_PROPERTY_CHANGED } private static final long serialVersionUID = 4851121531481734868L; @@ -73,6 +75,11 @@ * 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) + */ + protected Integer selectedAttachmentIndex; /** * les métas à afficher dans le panel de détaillié à un uuid et à une version @@ -101,6 +108,14 @@ return versions == null || selectedVersionIndex == null || selectedVersionIndex == -1 ? null : versions[selectedVersionIndex]; } + public Integer getSelectedAttachmentIndex() { + return selectedAttachmentIndex; + } + + public Attachment getAttachment() { + return selectedAttachmentIndex == null || selectedAttachmentIndex == -1 ? null : getDetail().getAttachment(selectedAttachmentIndex); + } + public Version getSelectedVersion(int integer) { return versions == null ? null : versions[integer]; } @@ -140,6 +155,13 @@ firePropertyChange(Properties.SELECTED_VERSION_INDEX_PROPERTY_CHANGED, oldSelectedVersionIndex, selectedVersionIndex); } + public void setSelectedAttachmentIndex(Integer selectedAttachmentIndex) { + Integer oldSelectedAttachmentIndex = this.selectedAttachmentIndex; + this.selectedAttachmentIndex = selectedAttachmentIndex; + // ui must update detail panel for the selected node and version + firePropertyChange(Properties.SELECTED_ATTACHMENT_INDEX_PROPERTY_CHANGED, oldSelectedAttachmentIndex, selectedAttachmentIndex); + } + protected Integer getVersionIndex(Version version) { if (versions != null && version != null) { for (int i = 0; i < versions.length; i++) { @@ -170,6 +192,7 @@ versions = null; resetSelectedVersion(); detail = null; + selectedAttachmentIndex=null; } public void resetSelectedVersion() {

1 0

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

Feb. 8, 2008

Author: tchemit Date: 2008-02-08 15:12:06 +0000 (Fri, 08 Feb 2008) New Revision: 748 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java Log: downloads 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-08 15:11:48 UTC (rev 747) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-02-08 15:12:06 UTC (rev 748) @@ -19,12 +19,20 @@ package fr.cemagref.simexplorer.is.service; import com.healthmarketscience.rmiio.RemoteInputStream; - 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; +import static fr.cemagref.simexplorer.is.factories.XmlConstants.FILE_DATA_PREFIX; +import static fr.cemagref.simexplorer.is.factories.XmlConstants.FILE_XML; +import static fr.cemagref.simexplorer.is.factories.XmlConstants.FOLDER_SEPARATOR; +import org.codelutin.util.ZipStreamEncoder; +import java.io.InputStream; +import java.io.PipedInputStream; +import java.io.PipedOutputStream; +import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.SortedMap; @@ -35,11 +43,10 @@ */ public class MockStorageServiceImpl implements StorageService { - /** The Constant SIZE. */ - static final int SIZE = 400; - protected MockDatabase base; + private Attachment xmlAttachment; + public MockStorageServiceImpl() { base = new MockDatabase(); } @@ -93,7 +100,7 @@ * @see fr.cemagref.simexplorer.is.service.StorageService#exportElement(java.lang.String, java.lang.String, java.lang.String) */ public RemoteInputStream retrieveElementXML(String token, String uuid, - String version) throws SimExplorerServiceException { + String version) throws SimExplorerServiceException { return (RemoteInputStream) checkImplemented(); } @@ -101,18 +108,75 @@ * @see fr.cemagref.simexplorer.is.service.StorageService#exportFull(java.lang.String, java.lang.String, java.lang.String) */ public RemoteInputStream retrieveElementFull(String token, String uuid, - String version) throws SimExplorerServiceException { + String version) throws SimExplorerServiceException { return (RemoteInputStream) checkImplemented(); } + /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.service.StorageService#retrieveData(java.lang.String, java.lang.String, java.lang.String, java.lang.String) - */ + * @see fr.cemagref.simexplorer.is.service.StorageService#retrieveData(java.lang.String, java.lang.String, java.lang.String, java.lang.String) + */ public RemoteInputStream retrieveElementData(String token, String uuid, - String version, Attachment attachment) throws SimExplorerServiceException { + String version, Attachment attachment) throws SimExplorerServiceException { + return null; } + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.service.StorageService#exportFull(java.lang.String, java.lang.String, java.lang.String) + */ + public InputStream downloadElementFull(String token, String uuid, + String version) throws SimExplorerServiceException { + LoggableElement element = getLoggableElement(token, uuid, version); + try { + PipedOutputStream pipedOut = new PipedOutputStream(); + Map<String, InputStream> files = new HashMap<String, InputStream>(); + files.put(FILE_XML, (InputStream) retrieveElementData(token, uuid, version, getXMLAttachment())); + List<LoggableElement> children = element.getChildren(); + for (LoggableElement loggableElement : children) { + MetaData thisMde = loggableElement.getMetaData(); + List<Attachment> attachments; + attachments = loggableElement.getMetaData().getAttachments(); + for (Attachment attachment : attachments) { + files.put(FILE_DATA_PREFIX + FOLDER_SEPARATOR + attachment.getUniqueId(), + (InputStream) retrieveElementData(token, thisMde.getUuid(), thisMde.getVersion().toString(), attachment)); + } + } + PipedInputStream pipedIn = new PipedInputStream(pipedOut); + ZipStreamEncoder zse = new ZipStreamEncoder(files, pipedOut); + zse.start(); + return pipedIn; + } catch (Exception e) { + throw new SimExplorerServiceException(e); + } + } + + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.service.StorageService#retrieveData(java.lang.String, java.lang.String, java.lang.String, java.lang.String) + */ + public InputStream downloadElementData(String token, String uuid, String version, Attachment attachment) throws SimExplorerServiceException { + LoggableElement element = getLoggableElement(token, uuid, version); + + try { + ElementGenerator.RandomStream stream = base.generateTextStream(); + String md5 = stream.getMd5(); + attachment.setDataHash(md5); + System.out.println("setMd5 "+ md5+" for "+element); + return stream.getStream(); + } catch (Exception e) { + throw new SimExplorerServiceException(e); + } + } + + private Attachment getXMLAttachment() { + if (xmlAttachment == null) { + xmlAttachment = new Attachment(); + xmlAttachment.setDataHash(""); + xmlAttachment.setFileName("entity.xml"); + } + return xmlAttachment; + } + public int findFullTextCount(String token, String query, boolean onlyLatest) throws SimExplorerServiceException { // TODO Changer

1 0

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

Feb. 8, 2008

Author: tchemit Date: 2008-02-08 15:11:48 +0000 (Fri, 08 Feb 2008) New Revision: 747 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockDatabase.java Log: reduction taille base + generateur texte Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockDatabase.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockDatabase.java 2008-02-08 15:11:26 UTC (rev 746) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockDatabase.java 2008-02-08 15:11:48 UTC (rev 747) @@ -42,7 +42,7 @@ */ public class MockDatabase { - static final int SIZE = 50; + static final int SIZE = 10; /** * le dictionnaire d'ea indexées par leur uuid. @@ -98,8 +98,8 @@ metadatas = new TreeMap<String, MetaData[]>(); metadatasIndex = new ArrayList<String>(); - for (int i = 0; i < SIZE; i++) { - int nbSons = 2 + r.nextInt(10); + for (int i = 0,max=SIZE+r.nextInt(10); i < max; i++) { + int nbSons = 2 + r.nextInt(3); Version[] versions = versionGenerator.generateVersions(nbSons + 1); ExplorationApplication parentEA = elementGenerator.generateRandomEA(); @@ -117,6 +117,9 @@ } registerEA(uuid, listSons.toArray(new ExplorationApplication[listSons.size()])); } + System.out.println("nb ExplorationApplications : "+eas.size()); + System.out.println("nb LoggableElements : "+loggableElements.size()); + System.out.println("nb MetaDatas : "+metadatas.size()); } protected void registerEA(String uuid, ExplorationApplication... eas) throws Exception { @@ -163,6 +166,10 @@ registerMetaData(uuid, datas.toArray(new MetaData[datas.size()])); } + public ElementGenerator.RandomStream generateTextStream() throws Exception { + return elementGenerator.generateTextStream(); + } + protected void registerMetaData(String uuid, MetaData... datas) { this.metadatas.put(uuid, datas); this.metadatasIndex.add(uuid);

1 0

r746 - trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata
by tchemit＠users.labs.libre-entreprise.org Feb. 8, 2008

Feb. 8, 2008

Author: tchemit Date: 2008-02-08 15:11:26 +0000 (Fri, 08 Feb 2008) New Revision: 746 Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java Log: utilisation objet plutot que primitive pour g?\195?\169rer la nullit?\195?\169 Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java =================================================================== --- trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java 2008-02-08 15:11:02 UTC (rev 745) +++ trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java 2008-02-08 15:11:26 UTC (rev 746) @@ -245,8 +245,8 @@ * @param attachmentIndex index of attachment to find * @return the correct attachment */ - public Attachment getAttachment(int attachmentIndex) { - if (attachmentIndex>-1 && attachments != null && !attachments.isEmpty() && attachments.size()>attachmentIndex) { + public Attachment getAttachment(Integer attachmentIndex) { + if (attachmentIndex!=null && attachmentIndex>-1 && attachments != null && !attachments.isEmpty() && attachments.size()>attachmentIndex) { return attachments.get(attachmentIndex); } return null;

1 0