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

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

04 Feb '08

Author: tchemit Date: 2008-02-04 11:42:56 +0000 (Mon, 04 Feb 2008) New Revision: 615 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java Log: renommage m?\195?\169thode repaintI18nActions en refreshI18nActions Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java 2008-02-04 11:42:25 UTC (rev 614) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java 2008-02-04 11:42:56 UTC (rev 615) @@ -52,10 +52,10 @@ SimExplorerActionManager.loadActions(this, null); // repaint i18n actions - repaintI18nActions(); + refreshI18nActions(); } - public void repaintI18nActions() { + public void refreshI18nActions() { LanguageEnum language = SimExplorer.getContext().getConfig().getLanguage(); CountryEnum country = SimExplorer.getContext().getConfig().getCountry(); String[] actions = SimExplorerActionManager.getFactory().getActionNames();

1 0

r614 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action
by tchemit＠users.labs.libre-entreprise.org 04 Feb '08

04 Feb '08

Author: tchemit Date: 2008-02-04 11:42:25 +0000 (Mon, 04 Feb 2008) New Revision: 614 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractTabAction.java Log: passage en log debug pour l'init des actions Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractAction.java 2008-02-04 11:42:02 UTC (rev 613) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractAction.java 2008-02-04 11:42:25 UTC (rev 614) @@ -63,7 +63,7 @@ protected SimExplorerAbstractAction(String name) { super(name); - log.info("> " + this); + log.debug("> " + this); } protected SimExplorerContext getContext() { Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractTabAction.java 2008-02-04 11:42:02 UTC (rev 613) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractTabAction.java 2008-02-04 11:42:25 UTC (rev 614) @@ -60,13 +60,13 @@ Converter convertorLanguage = ConverterUtil.getConverter(SimExplorerTab.class); tab = (SimExplorerTab) convertorLanguage.convert(SimExplorerTab.class, matcher.group(1)); - log.info(">>> " + this); + log.debug(">>> " + this); } protected SimExplorerAbstractTabAction(String name) { super(name); param = name; - log.info(">>> " + this); + log.debug(">>> " + this); } public String getParam() {

1 0

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

04 Feb '08

Author: tchemit Date: 2008-02-04 11:42:02 +0000 (Mon, 04 Feb 2008) New Revision: 613 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTabFactory.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowListTabAbstractAction.java Log: l'init des listeners sur les tab se sont dans les actions showTabXXX Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTabFactory.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTabFactory.java 2008-02-04 11:41:16 UTC (rev 612) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTabFactory.java 2008-02-04 11:42:02 UTC (rev 613) @@ -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,13 +15,11 @@ * 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; import fr.cemagref.simexplorer.is.ui.SimExplorer; import fr.cemagref.simexplorer.is.ui.SimExplorerRuntimeException; -import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; -import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationListTab; import fr.cemagref.simexplorer.is.ui.swing.util.MyTabHeader; import jaxx.runtime.JAXXObject; import jaxx.runtime.builder.TabContentConfig; @@ -31,10 +29,7 @@ import javax.swing.AbstractButton; import javax.swing.JComponent; import javax.swing.JTabbedPane; -import javax.swing.JTable; -import javax.swing.AbstractAction; import java.awt.Component; -import java.awt.event.ActionEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.lang.reflect.Field; @@ -64,28 +59,7 @@ } protected void initTab(JComponent tab, String tabName, TabContentConfig config) { - SimExplorerActionManager.loadActions((JAXXObject) tab, getTab(tabName)); - final SimExplorerTab def = getTab(tabName); - if (def == SimExplorerTab.local || def == SimExplorerTab.remote) { - // add a mouse listener on table - final JApplicationListTab comp = (JApplicationListTab) tab; - - comp.getTable().addMouseListener(new MouseAdapter() { - AbstractAction detailAction = SimExplorerActionManager.newAction("showTab_detail", (AbstractButton) null); - @Override - public void mouseClicked(MouseEvent e) { - if (e.getClickCount() == 2) { - JTable table = (JTable) e.getSource(); - int selectRow = table.getSelectedRow(); - DetailTabModel model = (DetailTabModel) SimExplorerTab.detail.getModel(); - model.setRemote(def== SimExplorerTab.remote); - model.setIndex(selectRow); - detailAction.actionPerformed(new ActionEvent(table, ActionEvent.ACTION_FIRST, "showTab_detail")); - System.out.println("action detail " + selectRow + " : " + table.getValueAt(selectRow, 0)); - } - } - }); - } + SimExplorerActionManager.loadActions((JAXXObject) tab, getTab(tabName)); } protected SimExplorerTab getTab(String tabName) { Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowListTabAbstractAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowListTabAbstractAction.java 2008-02-04 11:41:16 UTC (rev 612) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowListTabAbstractAction.java 2008-02-04 11:42:02 UTC (rev 613) @@ -18,29 +18,36 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.tab; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; +import fr.cemagref.simexplorer.is.ui.swing.action.ShowTabAbstractAction; +import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; +import fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel; +import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationListTab; -import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; -import fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel; -import fr.cemagref.simexplorer.is.ui.swing.action.ShowTabAbstractAction; -import fr.cemagref.simexplorer.is.entities.metadata.MetaData; +import jaxx.runtime.JAXXObject; +import javax.swing.AbstractAction; +import javax.swing.AbstractButton; import javax.swing.JTabbedPane; +import javax.swing.JTable; +import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; -import java.awt.Component; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; -import jaxx.runtime.JAXXObject; - /** @author chemit */ public class ShowListTabAbstractAction extends ShowTabAbstractAction<JApplicationListTab, ListTabModel> { private static final long serialVersionUID = 3813479850648257169L; protected boolean remote; - - public ShowListTabAbstractAction(String name,boolean remote) { + + public ShowListTabAbstractAction(String name, boolean remote) { super(name); - this.remote=remote; + this.remote = remote; } @Override @@ -70,6 +77,23 @@ } protected void initFirstUsage(final JApplicationListTab ui, final ListTabModel model) { + // add a show detail action when double click on a row of the table + ui.getTable().addMouseListener(new MouseAdapter() { + AbstractAction detailAction = SimExplorerActionManager.newAction("showTab_detail", (AbstractButton) null); + + @Override + public void mouseClicked(MouseEvent e) { + if (e.getClickCount() == 2) { + JTable table = (JTable) e.getSource(); + int selectRow = table.getSelectedRow(); + DetailTabModel model = (DetailTabModel) SimExplorerTab.detail.getModel(); + model.setRemote(remote); + model.setIndex(selectRow); + detailAction.actionPerformed(new ActionEvent(table, ActionEvent.ACTION_FIRST, "showTab_detail")); + System.out.println("action detail ("+remote+")" + selectRow + " : " + table.getValueAt(selectRow, 0)); + } + } + }); // push model into tableModel JApplicationTableModel modelTab = (JApplicationTableModel) ui.getTable().getModel(); modelTab.setData(model.getList());

1 0

r612 - trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages
by tchemit＠users.labs.libre-entreprise.org 04 Feb '08

04 Feb '08

Author: tchemit Date: 2008-02-04 11:41:16 +0000 (Mon, 04 Feb 2008) New Revision: 612 Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java Log: unused import + unused initializer Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java 2008-02-02 18:57:38 UTC (rev 611) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java 2008-02-04 11:41:16 UTC (rev 612) @@ -32,7 +32,6 @@ import com.healthmarketscience.rmiio.SimpleRemoteInputStream; import fr.cemagref.simexplorer.is.attachment.Attachment; -import fr.cemagref.simexplorer.is.attachment.ContentType; import fr.cemagref.simexplorer.is.entities.data.Component; import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; import fr.cemagref.simexplorer.is.entities.data.ExplorationData; @@ -64,7 +63,7 @@ try { for (int i = 0; i < c; i++) { - ExplorationApplication parentEa = null; + ExplorationApplication parentEa; parentEa = elementGenerator.generateRandomEA(); int v = 2 + r.nextInt(5);

1 0

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

02 Feb '08

Author: tchemit Date: 2008-02-02 18:57:38 +0000 (Sat, 02 Feb 2008) New Revision: 611 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java Log: synchronisation du bean dont on veut afficher le d?\195?\169tail et les versions Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java 2008-02-02 18:54:31 UTC (rev 610) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java 2008-02-02 18:57:38 UTC (rev 611) @@ -85,6 +85,7 @@ DefaultListModel historyModel = (DefaultListModel) historyList.getModel(); Version[] versions = model.getVersions(); + historyList.setSelectedIndex(-1); if (versions == null) { historyModel.setSize(0); } else { Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java 2008-02-02 18:54:31 UTC (rev 610) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java 2008-02-02 18:57:38 UTC (rev 611) @@ -165,9 +165,10 @@ protected static void refreshDetail(JApplicationDetailTab ui, LoggableElementTreeNode node, DetailTabModel model, StorageService service, String token) { boolean detail = model.isLoggableElement(node); String text; - LoggableElement element = (LoggableElement) node.getUserObject(); if (detail) { - text = "detail [" + node.getUserObject().getClass().getSimpleName() + "]" + node.getUserObject(); + LoggableElement element = (LoggableElement) node.getUserObject(); + model.setBean(element); + text = "detail [" + node.getUserObject().getClass().getSimpleName() + "]" + element; } else { text = "No detail"; }

1 0

r610 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab
by tchemit＠users.labs.libre-entreprise.org 02 Feb '08

02 Feb '08

Author: tchemit Date: 2008-02-02 18:54:31 +0000 (Sat, 02 Feb 2008) New Revision: 610 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowListTabAbstractAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java Log: distinction des types de service ?\195?\160 utiliser Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowListTabAbstractAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowListTabAbstractAction.java 2008-02-02 18:51:55 UTC (rev 609) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowListTabAbstractAction.java 2008-02-02 18:54:31 UTC (rev 610) @@ -36,8 +36,11 @@ public class ShowListTabAbstractAction extends ShowTabAbstractAction<JApplicationListTab, ListTabModel> { private static final long serialVersionUID = 3813479850648257169L; - public ShowListTabAbstractAction(String name) { + protected boolean remote; + + public ShowListTabAbstractAction(String name,boolean remote) { super(name); + this.remote=remote; } @Override @@ -61,7 +64,7 @@ if (data == null) { // first coming here, init model - model.initTabModel(false, getContext()); + model.initTabModel(remote, getContext()); } return true; } Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java 2008-02-02 18:51:55 UTC (rev 609) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java 2008-02-02 18:54:31 UTC (rev 610) @@ -49,6 +49,6 @@ private static final long serialVersionUID = 7009836674867908237L; public ShowLocalTabAction(String name) { - super(name); + super(name,false); } } \ No newline at end of file Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java 2008-02-02 18:51:55 UTC (rev 609) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java 2008-02-02 18:54:31 UTC (rev 610) @@ -36,6 +36,6 @@ private static final long serialVersionUID = -5791049785753596347L; public ShowRemoteTabAction(String name) { - super(name); + super(name,true); } } \ No newline at end of file

1 0

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

02 Feb '08

Author: tchemit Date: 2008-02-02 18:51:55 +0000 (Sat, 02 Feb 2008) New Revision: 609 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java Log: utilisation g?\195?\169n?\195?\169rateur de versions TODO il faut synchroniser les g?\195?\169n?\195?\169rateurs! Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java 2008-02-02 18:49:02 UTC (rev 608) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java 2008-02-02 18:51:55 UTC (rev 609) @@ -88,11 +88,15 @@ if (versions == null) { historyModel.setSize(0); } else { + Version currentVersion = model.getBean().getMetaData().getVersion(); historyModel.setSize(versions.length); for (int i = 0; i < versions.length; i++) { Version version = versions[i]; historyModel.setElementAt(version, i); + if (version.equals(currentVersion)) { + historyList.setSelectedIndex(i); + } } }

1 0

r608 - trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage
by tchemit＠users.labs.libre-entreprise.org 02 Feb '08

02 Feb '08

Author: tchemit Date: 2008-02-02 18:49:02 +0000 (Sat, 02 Feb 2008) New Revision: 608 Modified: trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/VersionGenerator.java Log: utilisation g?\195?\169n?\195?\169rateur de versions TODO il faut synchroniser les g?\195?\169n?\195?\169rateurs! Modified: trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java =================================================================== --- trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java 2008-02-02 18:48:12 UTC (rev 607) +++ trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java 2008-02-02 18:49:02 UTC (rev 608) @@ -26,7 +26,6 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; -import java.util.List; public class MetaDataGenerator { @@ -130,23 +129,17 @@ public MetaData[] generateVersionnedMetaData(Version mandatory) { - Version[] versions = VersionGenerator.getInstance().generateVersions(); + Version[] versions = VersionGenerator.getInstance().generateVersions(mandatory); String uuid = UUID.randomUUID().toString(); int nb = versions.length; + MetaData[] mes = new MetaData[nb]; - List<MetaData> mes = new ArrayList<MetaData>(); - - MetaData current = generateMetaDataEntity(uuid, versions[0]); - mes.add(current); - + mes[0] = generateMetaDataEntity(uuid, versions[0]); for (int i = 1; i < nb; i++) { - - MetaData newMeta = generateMetaDataEntity(uuid, versions[i], current); - mes.add(newMeta); - current = newMeta; + mes[i] = generateMetaDataEntity(uuid, versions[i], mes[i - 1]); } - return mes.toArray(new MetaData[mes.size()]); + return mes; } } Modified: trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/VersionGenerator.java =================================================================== --- trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/VersionGenerator.java 2008-02-02 18:48:12 UTC (rev 607) +++ trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/VersionGenerator.java 2008-02-02 18:49:02 UTC (rev 608) @@ -20,6 +20,10 @@ import fr.cemagref.simexplorer.is.entities.metadata.Version; import java.util.Random; +import java.util.List; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; /** @@ -63,6 +67,17 @@ return generateVersions(nb); } + public Version[] generateVersions(Version mandatory) { + int nb = generateNotNullAbsInt(MAX_NB_VERSIONS); + Version[] versions = generateVersions(nb); + List<Version> list = new ArrayList<Version>(Arrays.asList(versions)); + if (!list.contains(mandatory)) { + list.add(mandatory); + Collections.sort(list); + } + return list.toArray(new Version[list.size()]); + } + public Version[] generateVersions(int nb) { Version[] result = new Version[nb]; result[0] = generateVersion();

1 0

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

02 Feb '08

Author: tchemit Date: 2008-02-02 18:48:12 +0000 (Sat, 02 Feb 2008) New Revision: 607 Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java Log: utilisation g?\195?\169n?\195?\169rateur de versions TODO il faut synchroniser les g?\195?\169n?\195?\169rateurs! Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-02-02 17:05:05 UTC (rev 606) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-02-02 18:48:12 UTC (rev 607) @@ -22,6 +22,7 @@ import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; 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.storage.MetaDataGenerator; import java.util.ArrayList; @@ -134,7 +135,14 @@ } public MetaData[] getVersions(String token, String uuid) throws SimExplorerServiceException { - return getMetaGenerator().generateVersionnedMetaDataEntity(); + MetaData meta = mockData().get(uuid); + Version version; + if (meta==null) { + version = Version.valueOf("1.0"); + } else { + version = meta.getVersion(); + } + return getMetaGenerator().generateVersionnedMetaData(version); } public String loginUser(String login, String password) throws SimExplorerServiceException {

1 0

r606 - trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage
by tchemit＠users.labs.libre-entreprise.org 02 Feb '08

02 Feb '08

Author: tchemit Date: 2008-02-02 17:05:05 +0000 (Sat, 02 Feb 2008) New Revision: 606 Modified: trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java Log: utilisation g?\195?\169n?\195?\169rateur de versions TODO finir la derni?\195?\168re m?\195?\169thode Modified: trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java =================================================================== --- trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java 2008-02-02 17:04:35 UTC (rev 605) +++ trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java 2008-02-02 17:05:05 UTC (rev 606) @@ -17,20 +17,20 @@ * ##% */ package fr.cemagref.simexplorer.is.storage; +import fr.cemagref.simexplorer.is.attachment.Attachment; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; +import fr.cemagref.simexplorer.is.entities.metadata.Version; + import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.Map; -import java.util.Random; import java.util.UUID; +import java.util.List; -import fr.cemagref.simexplorer.is.attachment.Attachment; -import fr.cemagref.simexplorer.is.entities.metadata.MetaData; -import fr.cemagref.simexplorer.is.entities.metadata.Version; - public class MetaDataGenerator { - Random r = new Random(); + java.util.Random r = new java.util.Random(); /* * private static boolean descriptorFieldsInit = false; private static @@ -42,7 +42,7 @@ */ public MetaData generateMetaDataEntity(String uuid, Version version, - MetaData parentVersion, MetaData parentData) { + MetaData parentVersion, MetaData parentData) { MetaData me = generateMetaDataEntity(uuid, version, parentVersion); if (parentData != null) { me.setParentDataUuid(parentData.getUuid()); @@ -52,7 +52,7 @@ } public MetaData generateMetaDataEntity(String uuid, Version version, - MetaData parentVersion) { + MetaData parentVersion) { MetaData me = generateMetaDataEntity(uuid, version); if (parentVersion != null) { @@ -95,19 +95,58 @@ public MetaData generateMetaDataEntity() { return generateMetaDataEntity(UUID.randomUUID().toString(), - new Version("1.0")); + Version.valueOf("1.0")); } public MetaData[] generateVersionnedMetaDataEntity() { + + Version[] versions = VersionGenerator.getInstance().generateVersions(); String uuid = UUID.randomUUID().toString(); - MetaData[] mes = new MetaData[4]; - mes[0] = generateMetaDataEntity(uuid, new Version("1.0")); - mes[1] = generateMetaDataEntity(uuid, new Version("1.1"), mes[0]); - mes[2] = generateMetaDataEntity(uuid, new Version("1.2"), mes[1]); - mes[3] = generateMetaDataEntity(uuid, new Version("2.0"), mes[2]); + int nb = versions.length; + MetaData[] mes = new MetaData[nb]; + mes[0] = generateMetaDataEntity(uuid, versions[0]); + for (int i = 1; i < nb; i++) { + mes[i] = generateMetaDataEntity(uuid, versions[i], mes[i - 1]); + } return mes; } + public MetaData[] generateVersionnedMetaDataEntity(int nbMax) { + + Version[] versions = VersionGenerator.getInstance().generateVersions(nbMax); + String uuid = UUID.randomUUID().toString(); + + int nb = versions.length; + MetaData[] mes = new MetaData[nb]; + + mes[0] = generateMetaDataEntity(uuid, versions[0]); + for (int i = 1; i < nb; i++) { + mes[i] = generateMetaDataEntity(uuid, versions[i], mes[i - 1]); + } + return mes; + } + + public MetaData[] generateVersionnedMetaData(Version mandatory) { + + Version[] versions = VersionGenerator.getInstance().generateVersions(); + String uuid = UUID.randomUUID().toString(); + + int nb = versions.length; + + List<MetaData> mes = new ArrayList<MetaData>(); + + MetaData current = generateMetaDataEntity(uuid, versions[0]); + mes.add(current); + + for (int i = 1; i < nb; i++) { + + MetaData newMeta = generateMetaDataEntity(uuid, versions[i], current); + mes.add(newMeta); + current = newMeta; + } + return mes.toArray(new MetaData[mes.size()]); + } + }

1 0