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

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

Feb. 13, 2008

Author: tchemit Date: 2008-02-13 02:41:25 +0000 (Wed, 13 Feb 2008) New Revision: 885 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/actions.properties Log: les actions de l'historique et detailToTree Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/actions.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/actions.properties 2008-02-13 02:41:16 UTC (rev 884) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/actions.properties 2008-02-13 02:41:25 UTC (rev 885) @@ -61,6 +61,10 @@ # detail to tree action action.detailToTree=fr.cemagref.simexplorer.is.ui.swing.actions.DetailToTreeAction +# navigation history actions +action.historyNext=fr.cemagref.simexplorer.is.ui.swing.actions.HistoryNextAction +action.historyPrevious=fr.cemagref.simexplorer.is.ui.swing.actions.HistoryPreviousAction + # import- export actions action.exportElement=fr.cemagref.simexplorer.is.ui.swing.actions.ExportAction action.exportElementToLocal=fr.cemagref.simexplorer.is.ui.swing.actions.ExportToLocalAction

1 0

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

Feb. 13, 2008

Author: tchemit Date: 2008-02-13 02:41:16 +0000 (Wed, 13 Feb 2008) New Revision: 884 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties Log: i18n pour les actions de l'historique et detailToTree Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-12 23:20:26 UTC (rev 883) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-13 02:41:16 UTC (rev 884) @@ -24,6 +24,9 @@ simexplorer.action.deleteLoggableElement=Delete element simexplorer.action.deleteLoggableElement.help= simexplorer.action.deleteLoggableElement.tooltip=Delete element ''{0}'' +simexplorer.action.detailToTree=Synchronize detail to tree +simexplorer.action.detailToTree.help= +simexplorer.action.detailToTree.tooltip=Synchronize element ''{0}'' as navigation root node simexplorer.action.downloadAttachment=Download Attachment simexplorer.action.downloadAttachment.help= simexplorer.action.downloadAttachment.tooltip=Download attachment ''{0}'' @@ -69,6 +72,12 @@ simexplorer.action.hide.synchronize=Synchronize simexplorer.action.hide.synchronize.help= simexplorer.action.hide.synchronize.tooltip=Hide Synchronize screen +simexplorer.action.historyNext=Next in history +simexplorer.action.historyNext.help= +simexplorer.action.historyNext.tooltip=Display next element ''{0}'' +simexplorer.action.historyPrevious=Previous in history +simexplorer.action.historyPrevious.help= +simexplorer.action.historyPrevious.tooltip=Display previous element ''{0}'' simexplorer.action.i18n.en=English simexplorer.action.i18n.en.help= simexplorer.action.i18n.en.tooltip=Change to english language Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-12 23:20:26 UTC (rev 883) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-13 02:41:16 UTC (rev 884) @@ -24,6 +24,9 @@ simexplorer.action.deleteLoggableElement=Supprimer simexplorer.action.deleteLoggableElement.help= simexplorer.action.deleteLoggableElement.tooltip=Supprimer l''\u00E9l\u00E9ment ''{0}'' +simexplorer.action.detailToTree=Afficher dans l'arbre +simexplorer.action.detailToTree.help= +simexplorer.action.detailToTree.tooltip=Positionne l''\u00E9l\u00E9ment ''{0}'' comme racine de l''arbre de navigation simexplorer.action.downloadAttachment=T\u00E9l\u00E9charger le fichier attach\u00E9 simexplorer.action.downloadAttachment.help= simexplorer.action.downloadAttachment.tooltip=T\u00E9l\u00E9charger le fichier attach\u00E9 ''{0}'' @@ -69,6 +72,12 @@ simexplorer.action.hide.synchronize=Synchronisation simexplorer.action.hide.synchronize.help= simexplorer.action.hide.synchronize.tooltip=Cacher l'\u00E9cran de synchronisation +simexplorer.action.historyNext=El\u00E9ment suivant +simexplorer.action.historyNext.help= +simexplorer.action.historyNext.tooltip=Afficher l''\u00E9l\u00E9ment suivant ''{0}'' +simexplorer.action.historyPrevious=El\u00E9ment pr\u00E9c\u00E9dent +simexplorer.action.historyPrevious.help= +simexplorer.action.historyPrevious.tooltip=Afficher l''\u00E9l\u00E9ment pr\u00E9c\u00E9dent ''{0}'' simexplorer.action.i18n.en=Anglais simexplorer.action.i18n.en.help= simexplorer.action.i18n.en.tooltip=Traduire l'application en anglais

1 0

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

Feb. 12, 2008

Author: tchemit Date: 2008-02-12 23:20:26 +0000 (Tue, 12 Feb 2008) New Revision: 883 Added: trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/detail-to-tree.png Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/delete.png Log: icones Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/delete.png =================================================================== (Binary files differ) Added: trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/detail-to-tree.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/detail-to-tree.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

1 0

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

Feb. 12, 2008

Author: tchemit Date: 2008-02-12 23:20:14 +0000 (Tue, 12 Feb 2008) New Revision: 882 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeHelper.java Log: on blinde la construction de l'abre de navigation Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeHelper.java 2008-02-12 23:19:51 UTC (rev 881) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeHelper.java 2008-02-12 23:20:14 UTC (rev 882) @@ -135,14 +135,18 @@ LoggableElementTreeNode tmpNode; // build components node and his childs tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.components"), true); - for (Component component : element.getComponents()) { - buildComponentNode(tmpNode, component); + if (element.getComponents()!=null) { + for (Component component : element.getComponents()) { + buildComponentNode(tmpNode, component); + } } // build explorations node and his childs tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.explorations"), true); - for (ExplorationData explorationData : element.getExplorations()) { - buildExplorationDataNode(tmpNode, explorationData); + if (element.getExplorations()!=null) { + for (ExplorationData explorationData : element.getExplorations()) { + buildExplorationDataNode(tmpNode, explorationData); + } } return result; } @@ -154,26 +158,34 @@ // build constantes nodes tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.constants"), true); - for (Constant constante : element.getConstants()) { - buildConstantNode(tmpNode, constante); + if (element.getConstants()!=null) { + for (Constant constante : element.getConstants()) { + buildConstantNode(tmpNode, constante); + } } // build structures nodes tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.structures"), true); - for (Structure structure : element.getStructures()) { - buildStructureNode(tmpNode, structure); + if (element.getStructures()!=null) { + for (Structure structure : element.getStructures()) { + buildStructureNode(tmpNode, structure); + } } // build Codes nodes tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.codes"), true); - for (Code code : element.getCodes()) { - buildCodeNode(tmpNode, code); + if (element.getCodes()!=null) { + for (Code code : element.getCodes()) { + buildCodeNode(tmpNode, code); + } } // build libraries nodes tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.libraries"), true); - for (Library library : element.getLibraries()) { - buildLibraryNode(tmpNode, library); + if (element.getLibraries()!=null) { + for (Library library : element.getLibraries()) { + buildLibraryNode(tmpNode, library); + } } return result; @@ -184,11 +196,15 @@ LoggableElementTreeNode tmpNode; // build constant values nodes tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.constantvalues"), true); - for (ConstantValue library : element.getValuesMap()) { - buildConstantValueNode(tmpNode, library); + if (element.getValuesMap()!=null) { + for (ConstantValue library : element.getValuesMap()) { + buildConstantValueNode(tmpNode, library); + } } // build result node - buildResultNode(result, element.getResult()); + if (element.getResult()!=null) { + buildResultNode(result, element.getResult()); + } return result; }

1 0

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

Feb. 12, 2008

Author: tchemit Date: 2008-02-12 23:19:51 +0000 (Tue, 12 Feb 2008) New Revision: 881 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java Log: pour le moment on utilise pas la barre de notification, il faut supprimer le synchronie dans StatusBar car cela givre l'ui car le code est execute dansle thread d'ui Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java 2008-02-12 23:19:01 UTC (rev 880) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java 2008-02-12 23:19:51 UTC (rev 881) @@ -40,7 +40,8 @@ public void setStatus(final String msg) { Runnable runnable = new Runnable() { public void run() { - getStatusBar().setStatus(msg); + //TODO il faut enlever le synchronize dans statusBar + //getStatusBar().setStatus(msg); } }; SwingUtilities.invokeLater(runnable);

1 0

r880 - in trunk/simexplorer-is/simexplorer-is-swing/src: java/fr/cemagref/simexplorer/is/ui/swing/actions resources uimodel/fr/cemagref/simexplorer/is/ui/swing
by tchemit＠users.labs.libre-entreprise.org Feb. 12, 2008

Feb. 12, 2008

Author: tchemit Date: 2008-02-12 23:19:01 +0000 (Tue, 12 Feb 2008) New Revision: 880 Added: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DetailToTreeAction.java Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/actions.properties trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JDetailTab.jaxx Log: ajout action detail to tree Added: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DetailToTreeAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DetailToTreeAction.java (rev 0) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DetailToTreeAction.java 2008-02-12 23:19:01 UTC (rev 880) @@ -0,0 +1,88 @@ +/* +* ##% 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 +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* 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.swing.actions; + +import fr.cemagref.simexplorer.is.entities.data.LoggableElement; +import fr.cemagref.simexplorer.is.entities.metadata.Version; +import fr.cemagref.simexplorer.is.ui.StorageServiceHelper; +import fr.cemagref.simexplorer.is.ui.swing.JDetailTab; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUIRefreshHelper; +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.LoggableElementTreeNode; + +import java.awt.event.ActionEvent; + +/** + * Action pour positionner un element comme root de l'arbre de navigation à + * partir de son detail + * + * @author chemit + */ + at jaxx.runtime.builder.ActionConfig( + actionCommand = "detailToTreeApplication", + name = "simexplorer.action.detailToTree", + shortDescription = "simexplorer.action.detailToTree.tooltip", + longDescription = "simexplorer.action.detailToTree.help", + smallIcon = "action/detail-to-tree.png", + mnemonic = 'd', + hideActionText = true +) +public class DetailToTreeAction extends SimExplorerAbstractTabAction { + + LoggableElementTreeNode node; + LoggableElement element; + String uuid; + Version version; + DetailTabModel model; + + private static final long serialVersionUID = 2165684159831076054L; + + public DetailToTreeAction(String name) { + super(name); + } + + @Override + protected boolean beforeAction(ActionEvent e) throws Exception { + if (!super.beforeAction(e)) { + return false; + } + model = (DetailTabModel) getModel(); + uuid = model.getDetail().getUuid(); + version = model.getSelectedVersion(); + element = StorageServiceHelper.getElement(getContext(), model.isRemote(), uuid, version.toString()); + return element != null; + } + + @Override + protected void doAction(ActionEvent e) throws Exception { + model.setRootNode(element); + SimExplorerUIRefreshHelper.updateDetailNavigationTree((JDetailTab) getUI(), model); + } + + @Override + protected void clear() { + super.clear(); + node = null; + element = null; + version = null; + uuid = null; + model = null; + } +} \ No newline at end of file Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/actions.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/actions.properties 2008-02-12 21:55:59 UTC (rev 879) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/actions.properties 2008-02-12 23:19:01 UTC (rev 880) @@ -58,6 +58,9 @@ # delete action action.deleteElement=fr.cemagref.simexplorer.is.ui.swing.actions.DeleteElementAction +# detail to tree action +action.detailToTree=fr.cemagref.simexplorer.is.ui.swing.actions.DetailToTreeAction + # import- export actions action.exportElement=fr.cemagref.simexplorer.is.ui.swing.actions.ExportAction action.exportElementToLocal=fr.cemagref.simexplorer.is.ui.swing.actions.ExportToLocalAction Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JDetailTab.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JDetailTab.jaxx 2008-02-12 21:55:59 UTC (rev 879) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JDetailTab.jaxx 2008-02-12 23:19:01 UTC (rev 880) @@ -12,6 +12,7 @@ <cell anchor="east"> <JToolBar> <JButton id='collapseAllDetail'/> + <JButton id='collapseAllDetail'/> <JButton id='expandAllDetail'/> </JToolBar> </cell> @@ -68,8 +69,23 @@ <cell anchor='west'> <JLabel text='simexplorer.common.version'/> </cell> - <cell weightx="1" anchor='west'> - <JComboBox id='detailVersions' model='{new DefaultComboBoxModel()}'/> + <cell weightx="1" anchor='west' fill="both"> + <Table> + <row fill="both"> + <cell anchor="west"> + <JComboBox id='detailVersions' model='{new DefaultComboBoxModel()}'/> + </cell> + <cell fill="horizontal" weightx="2"> + <JLabel text=""/> + </cell> + <cell anchor="east"> + <JToolBar> + <JButton id='detailToTree'/> + </JToolBar> + </cell> + </row> + </Table> + </cell> </row> <row fill='vertical'>

1 0

r879 - trunk/simexplorer-is/simexplorer-is-swing
by tchemit＠users.labs.libre-entreprise.org Feb. 12, 2008

Feb. 12, 2008

Author: tchemit Date: 2008-02-12 21:55:59 +0000 (Tue, 12 Feb 2008) New Revision: 879 Modified: trunk/simexplorer-is/simexplorer-is-swing/pom.xml Log: pas besoin de specifier le groupId, celui du parent est pris par defaut et c'est le meme. TODO : le faire surles autres modules du projet Modified: trunk/simexplorer-is/simexplorer-is-swing/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/pom.xml 2008-02-12 21:11:22 UTC (rev 878) +++ trunk/simexplorer-is/simexplorer-is-swing/pom.xml 2008-02-12 21:55:59 UTC (rev 879) @@ -5,7 +5,6 @@ <modelVersion>4.0.0</modelVersion> - <groupId>simexplorer-is</groupId> <artifactId>simexplorer-is-swing</artifactId> <name>Swing</name>

1 0

r878 - trunk/simexplorer-is
by tchemit＠users.labs.libre-entreprise.org Feb. 12, 2008

Feb. 12, 2008

Author: tchemit Date: 2008-02-12 21:11:22 +0000 (Tue, 12 Feb 2008) New Revision: 878 Modified: trunk/simexplorer-is/pom.xml Log: ajout du plugin pour deployer aussi les sources des differents modules Modified: trunk/simexplorer-is/pom.xml =================================================================== --- trunk/simexplorer-is/pom.xml 2008-02-12 19:56:05 UTC (rev 877) +++ trunk/simexplorer-is/pom.xml 2008-02-12 21:11:22 UTC (rev 878) @@ -170,8 +170,19 @@ <encoding>${maven.compile.encoding}</encoding> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> - </plugins> + </plugins> </build> <dependencies>

1 0

r877 - trunk/simexplorer-is/src/site/fr/rst
by glandais＠users.labs.libre-entreprise.org Feb. 12, 2008

Feb. 12, 2008

Author: glandais Date: 2008-02-12 19:56:05 +0000 (Tue, 12 Feb 2008) New Revision: 877 Modified: trunk/simexplorer-is/src/site/fr/rst/todo.rst Log: todo list update Modified: trunk/simexplorer-is/src/site/fr/rst/todo.rst =================================================================== --- trunk/simexplorer-is/src/site/fr/rst/todo.rst 2008-02-12 19:55:54 UTC (rev 876) +++ trunk/simexplorer-is/src/site/fr/rst/todo.rst 2008-02-12 19:56:05 UTC (rev 877) @@ -5,7 +5,6 @@ Serveur central =============== - - Règles de gestion pour la journalisation d'un élément - Règles de gestion pour la suppression d'élément (élément liés, etc) - Règles de gestion pour la suppression d'un groupe/utilisateur (affichage selon flag)

1 0

r876 - trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service
by glandais＠users.labs.libre-entreprise.org Feb. 12, 2008

Feb. 12, 2008

Author: glandais Date: 2008-02-12 19:55:54 +0000 (Tue, 12 Feb 2008) New Revision: 876 Added: trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceLocalVersions.java Removed: trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceLocalReplace.java Log: Test business rules Deleted: trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceLocalReplace.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceLocalReplace.java 2008-02-12 19:55:26 UTC (rev 875) +++ trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceLocalReplace.java 2008-02-12 19:55:54 UTC (rev 876) @@ -1,119 +0,0 @@ -/* -* ##% Copyright (C) 2008 Code Lutin, Gabriel Landais -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* 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.service; - -import java.io.InputStream; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Random; -import java.util.Set; - -import junit.framework.TestCase; -import fr.cemagref.simexplorer.is.attachment.Attachment; -import fr.cemagref.simexplorer.is.entities.data.Component; -import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; -import fr.cemagref.simexplorer.is.entities.data.ExplorationData; -import fr.cemagref.simexplorer.is.entities.data.Library; -import fr.cemagref.simexplorer.is.entities.metadata.MetaData; -import fr.cemagref.simexplorer.is.factories.BaseEntityFactory; -import fr.cemagref.simexplorer.is.factories.MetaDataFactory; -import fr.cemagref.simexplorer.is.factories.XmlConstants; -import fr.cemagref.simexplorer.is.service.ElementGenerator.RandomStream; - -public class StorageServiceLocalReplace extends TestCase { - - /** The storage service. */ - private StorageService storageService; - - /** The element generator. */ - private ElementGenerator elementGenerator; - - /** The r. */ - private Random r = new Random(); - - /* (non-Javadoc) - * @see junit.framework.TestCase#setUp() - */ - @Override - protected void setUp() throws Exception { - super.setUp(); - elementGenerator = new ElementGenerator(); - - storageService = new StorageServiceClient(); - } - - private MetaData saveEa(ExplorationApplication ea) throws Exception { - Map<Attachment, SimExplorerServiceStream> attachments = new HashMap<Attachment, SimExplorerServiceStream>(); - - List<Attachment> attachmentsKeys = new ArrayList<Attachment>(); - - attachmentsKeys.addAll(ea.getMetaData().getAttachments()); - Set<Component> components = ea.getComponents(); - for (Component component : components) { - attachmentsKeys.addAll(component.getMetaData().getAttachments()); - Set<Library> libraries = component.getLibraries(); - for (Library library : libraries) { - attachmentsKeys.addAll(library.getMetaData().getAttachments()); - } - } - Set<ExplorationData> explorations = ea.getExplorations(); - for (ExplorationData explorationData : explorations) { - attachmentsKeys.addAll(explorationData.getMetaData() - .getAttachments()); - } - - for (Attachment attachment : attachmentsKeys) { - RandomStream randomStream = elementGenerator.generateTextStream(); - attachment.setDataHash(randomStream.getMd5()); - SimExplorerServiceStream stream = new SimExplorerServiceStream( - randomStream.getStream()); - attachments.put(attachment, stream); - } - - SimExplorerServiceStream xmlStream = new SimExplorerServiceStream( - BaseEntityFactory.getFactory(ExplorationApplication.class) - .saveElement(XmlConstants.VALUE_METADATA_TYPE_EA, ea)); - - return storageService.saveElement(null, xmlStream, attachments); - } - - public void testReplace() throws Exception { - ExplorationApplication ea; - MetaData mde; - InputStream stream; - - MetaDataFactory<MetaData> mdeFactory = MetaDataFactory - .getFactory(MetaData.class); - - ea = elementGenerator.generateRandomEA(); - mde = saveEa(ea); - stream = storageService.retrieveElementXML(null, mde.getUuid(), mde - .getVersion().toString()); - System.out.println(mdeFactory.computeHash(stream)); - - ea.getMetaData().setVersion( - ea.getMetaData().getVersion().incVersion(0).toString()); - - mde = saveEa(ea); - stream = storageService.retrieveElementXML(null, mde.getUuid(), mde - .getVersion().toString()); - System.out.println(mdeFactory.computeHash(stream)); - } -} Copied: trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceLocalVersions.java (from rev 873, trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceLocalReplace.java) =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceLocalVersions.java (rev 0) +++ trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceLocalVersions.java 2008-02-12 19:55:54 UTC (rev 876) @@ -0,0 +1,183 @@ +/* +* ##% Copyright (C) 2008 Code Lutin, Gabriel Landais +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* 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.service; + +import java.io.InputStream; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.Set; + +import junit.framework.TestCase; +import fr.cemagref.simexplorer.is.attachment.Attachment; +import fr.cemagref.simexplorer.is.entities.data.Code; +import fr.cemagref.simexplorer.is.entities.data.Component; +import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; +import fr.cemagref.simexplorer.is.entities.data.ExplorationData; +import fr.cemagref.simexplorer.is.entities.data.Library; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; +import fr.cemagref.simexplorer.is.factories.BaseEntityFactory; +import fr.cemagref.simexplorer.is.factories.MetaDataFactory; +import fr.cemagref.simexplorer.is.factories.XmlConstants; +import fr.cemagref.simexplorer.is.service.ElementGenerator.RandomStream; + +public class StorageServiceLocalVersions extends TestCase { + + /** The storage service. */ + private StorageService storageService; + + /** The element generator. */ + private ElementGenerator elementGenerator; + + /** The r. */ + private Random r = new Random(); + + private Map<Attachment, SimExplorerServiceStream> attachments; + + /* (non-Javadoc) + * @see junit.framework.TestCase#setUp() + */ + @Override + protected void setUp() throws Exception { + super.setUp(); + elementGenerator = new ElementGenerator(); + + storageService = new StorageServiceClient(); + } + + private MetaData saveEa(ExplorationApplication ea, + boolean computeAttachments) throws Exception { + + if (computeAttachments) { + attachments = new HashMap<Attachment, SimExplorerServiceStream>(); + + List<Attachment> attachmentsKeys = new ArrayList<Attachment>(); + + attachmentsKeys.addAll(ea.getMetaData().getAttachments()); + Set<Component> components = ea.getComponents(); + for (Component component : components) { + attachmentsKeys + .addAll(component.getMetaData().getAttachments()); + Set<Library> libraries = component.getLibraries(); + for (Library library : libraries) { + attachmentsKeys.addAll(library.getMetaData() + .getAttachments()); + } + } + Set<ExplorationData> explorations = ea.getExplorations(); + for (ExplorationData explorationData : explorations) { + attachmentsKeys.addAll(explorationData.getMetaData() + .getAttachments()); + } + + for (Attachment attachment : attachmentsKeys) { + RandomStream randomStream = elementGenerator + .generateTextStream(); + attachment.setDataHash(randomStream.getMd5()); + SimExplorerServiceStream stream = new SimExplorerServiceStream( + randomStream.getStream()); + attachments.put(attachment, stream); + } + } + + SimExplorerServiceStream xmlStream = new SimExplorerServiceStream( + BaseEntityFactory.getFactory(ExplorationApplication.class) + .saveElement(XmlConstants.VALUE_METADATA_TYPE_EA, ea)); + + return storageService.saveElement(null, xmlStream, attachments); + } + + private void testVersionUpdate(String firstVersion, String secondVersion, + String assertFirst, String assertSecond, boolean different) + throws Exception { + ExplorationApplication ea; + + MetaDataFactory<MetaData> mdeFactory = MetaDataFactory + .getFactory(MetaData.class); + + ea = elementGenerator.generateRandomEA(); + + ea.getMetaData().setVersion(firstVersion); + + MetaData mde1 = saveEa(ea, true); + + ea.getMetaData().setVersion(secondVersion); + + if (different) { + Component component = ea.getComponents().iterator().next(); + Code code = new Code(); + code.setCode("regreg"); + code.setLanguage("regreg"); + component.getCodes().add(code); + } + + MetaData mde2 = saveEa(ea, false); + + assertEquals(mde1.getVersion().toString(), assertFirst); + assertEquals(mde2.getVersion().toString(), assertSecond); + } + + public void testVersionUpdate() throws Exception { + System.out.println("1.1A + 1.0A = 1.1A"); + testVersionUpdate("1.1", "1.0", "1.1", "1.1", false); + System.out.println("1.1A + 1.1A = 1.1A"); + testVersionUpdate("1.1", "1.1", "1.1", "1.1", false); + System.out.println("1.1A + 2.1A = 2.1A"); + //testVersionUpdate("1.1", "2.1", "2.1", "2.1", false); + System.out.println("1.1A + 1.0B = 1.1A + 1.2B"); + testVersionUpdate("1.1", "1.0", "1.1", "1.2", true); + System.out.println("1.1A + 1.1B = 1.1A + 1.2B"); + testVersionUpdate("1.1", "1.1", "1.1", "1.2", true); + System.out.println("1.1A + 1.1.5B = 1.1A + 1.2B"); + testVersionUpdate("1.1", "1.1.5", "1.1", "1.2", true); + System.out.println("1.1A + 2.1B = 1.1A + 2.1B"); + testVersionUpdate("1.1", "2.1", "1.1", "2.1", true); + } + + /* + public void testVersionUpdate2() throws Exception { + ExplorationApplication ea; + + MetaDataFactory<MetaData> mdeFactory = MetaDataFactory + .getFactory(MetaData.class); + + ea = elementGenerator.generateRandomEA(); + MetaData mde1 = saveEa(ea, true); + + Component component = ea.getComponents().iterator().next(); + Code code = new Code(); + code.setCode("regreg"); + code.setLanguage("regreg"); + component.getCodes().add(code); + + MetaData mde2 = saveEa(ea, false); + + InputStream stream1 = storageService.retrieveElementXML(null, mde1 + .getUuid(), mde1.getVersion().toString()); + InputStream stream2 = storageService.retrieveElementXML(null, mde2 + .getUuid(), mde2.getVersion().toString()); + + assertFalse(mdeFactory.computeHash(stream1).equals( + mdeFactory.computeHash(stream2))); + assertEquals(mde1.getVersion(), mde2.getVersion().incVersion(1)); + } + */ + +}

1 0