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

r504 - trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service
by glandais＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: glandais Date: 2008-01-24 18:00:06 +0000 (Thu, 24 Jan 2008) New Revision: 504 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/StorageService.java trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceServer.java Log: retrieve data & get versions 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-01-24 17:58:21 UTC (rev 503) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-01-24 18:00:06 UTC (rev 504) @@ -18,19 +18,20 @@ * ##% */ package fr.cemagref.simexplorer.is.service; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.SortedMap; +import java.util.TreeMap; + import com.healthmarketscience.rmiio.RemoteInputStream; import com.healthmarketscience.rmiio.RemoteOutputStream; + +import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; -import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; import fr.cemagref.simexplorer.is.storage.MetaDataGenerator; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.SortedMap; -import java.util.TreeMap; - /** @author tony */ public class MockStorageServiceImpl implements StorageService { Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java 2008-01-24 17:58:21 UTC (rev 503) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java 2008-01-24 18:00:06 UTC (rev 504) @@ -26,6 +26,7 @@ import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.Version; /** * Service interface @@ -205,4 +206,17 @@ */ MetaDataEntity[] getVersions(String token, String uuid) throws Exception; + /** + * @param token + * @param uuid + * @param version + */ +// void deleteElement(String token, String uuid, Version version); + + /** + * @param token + * @param uuid + */ +// void deleteElement(String token, String uuid); + } Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java 2008-01-24 17:58:21 UTC (rev 503) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java 2008-01-24 18:00:06 UTC (rev 504) @@ -32,14 +32,4 @@ return null; } - public RemoteInputStream retrieveData(String token, String uuid, String version, String dataKey) throws Exception { - //TODO - return null; - } - - public MetaDataEntity[] getVersions(String token, String uuid) throws Exception { - //TODO - return new MetaDataEntity[0]; - } - } Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-01-24 17:58:21 UTC (rev 503) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-01-24 18:00:06 UTC (rev 504) @@ -29,14 +29,15 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; - import org.w3c.dom.Document; import org.w3c.dom.Element; import com.healthmarketscience.rmiio.RemoteInputStream; import com.healthmarketscience.rmiio.RemoteInputStreamClient; +import com.healthmarketscience.rmiio.RemoteInputStreamServer; import com.healthmarketscience.rmiio.RemoteOutputStream; import com.healthmarketscience.rmiio.RemoteOutputStreamClient; +import com.healthmarketscience.rmiio.SimpleRemoteInputStream; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; @@ -172,6 +173,15 @@ return saveElement(token, idxml, idsattachment); } + public RemoteInputStream retrieveData(String token, String uuid, + String version, String dataKey) throws Exception { + MetaDataEntity mde = getMetadata(token, uuid, version); + InputStream stream = storageEngine.retrieveData(token, mde, dataKey); + RemoteInputStreamServer remoteStream = new SimpleRemoteInputStream( + stream); + return remoteStream.export(); + } + public void exportElement(String token, RemoteOutputStream xmlOutputStream, String uuid, String version) throws Exception { MetaDataEntity mde = getMetadata(token, uuid, version); @@ -340,4 +350,8 @@ } + public MetaDataEntity[] getVersions(String token, String uuid) throws Exception { + Set<MetaDataEntity> versions = storageEngine.getElementVersions(token, uuid); + return versions.toArray(new MetaDataEntity[versions.size()]); + } } Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceServer.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceServer.java 2008-01-24 17:58:21 UTC (rev 503) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceServer.java 2008-01-24 18:00:06 UTC (rev 504) @@ -54,14 +54,4 @@ return token; } - public RemoteInputStream retrieveData(String token, String uuid, String version, String dataKey) throws Exception { - //TODO - return null; - } - - public MetaDataEntity[] getVersions(String token, String uuid) throws Exception { - //TODO - return new MetaDataEntity[0]; - } - }

1 0

r503 - trunk/simexplorer-is-ear
by glandais＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: glandais Date: 2008-01-24 17:58:21 +0000 (Thu, 24 Jan 2008) New Revision: 503 Modified: trunk/simexplorer-is-ear/pom.xml Log: WAR in EAR Modified: trunk/simexplorer-is-ear/pom.xml =================================================================== --- trunk/simexplorer-is-ear/pom.xml 2008-01-24 14:43:26 UTC (rev 502) +++ trunk/simexplorer-is-ear/pom.xml 2008-01-24 17:58:21 UTC (rev 503) @@ -48,6 +48,12 @@ <version>0.0.1-SNAPSHOT</version> <type>ejb</type> </dependency> + <dependency> + <groupId>simexplorer-is</groupId> + <artifactId>simexplorer-is-web</artifactId> + <version>0.0.1-SNAPSHOT</version> + <type>war</type> + </dependency> </dependencies> </project>

1 0

r502 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 14:43:26 +0000 (Thu, 24 Jan 2008) New Revision: 502 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ResetSearchApplicationAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/SearchApplicationAction.java Log: implantation des actions de recherche et de reset de recherche Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ResetSearchApplicationAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ResetSearchApplicationAction.java 2008-01-24 14:42:09 UTC (rev 501) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ResetSearchApplicationAction.java 2008-01-24 14:43:26 UTC (rev 502) @@ -19,7 +19,13 @@ package fr.cemagref.simexplorer.is.ui.swing.action.application; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; +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 javax.swing.JTable; +import java.awt.event.ActionEvent; + /** * Action pour réinitialiser une recherche d'application * @@ -39,13 +45,40 @@ private static final long serialVersionUID = -155773498930710467L; + public ResetSearchApplicationAction(String name) { super(name); } @Override - public void actionPerformed(java.awt.event.ActionEvent e) { - super.actionPerformed(e); - //TODO + protected boolean beforeAction(ActionEvent e) throws Exception { + ListTabModel model = (ListTabModel) getModel(); + String query = model.getQuery(); + // only reset search if something was previously search + return query != null && !query.isEmpty(); } + + @Override + protected void doAction(ActionEvent e) throws Exception { + super.doAction(e); + ListTabModel model = (ListTabModel) getModel(); + + // reset query in model + model.setQuery(null); + + // a new search begins always on first page + model.getPagination().setFirstIndex(0); + + // get data from service + model.updateTabModel(isRemote(), getContext()); + + // update table model in ui + JApplicationListTab container = (JApplicationListTab) getUI(); + JTable table = container.getTable(); + JApplicationTableModel modelTab = (JApplicationTableModel) table.getModel(); + modelTab.setData(model.getList()); + + // refresh ui + getMainUI().refreshListTabUI(model, container); + } } \ No newline at end of file Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/SearchApplicationAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/SearchApplicationAction.java 2008-01-24 14:42:09 UTC (rev 501) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/SearchApplicationAction.java 2008-01-24 14:43:26 UTC (rev 502) @@ -18,9 +18,15 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.application; -import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; +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.tab.JApplicationListTab; +import javax.swing.JTextField; +import javax.swing.JTable; +import java.awt.event.ActionEvent; + /** * Action pour lancer une recherche d'application * @@ -39,9 +45,45 @@ public class SearchApplicationAction extends SimExplorerAbstractTabAction { private static final long serialVersionUID = -8537587629478588257L; + String query; public SearchApplicationAction(String name) { super(name); } + @Override + protected boolean beforeAction(ActionEvent e) throws Exception { + JTextField uiObject = (JTextField) getUIObject("searchText"); + query = uiObject.getText(); + ListTabModel model = (ListTabModel) getModel(); + return !query.isEmpty() && !query.equals(model.getQuery()); + } + + @Override + protected void doAction(ActionEvent e) throws Exception { + super.doAction(e); + ListTabModel model = (ListTabModel) getModel(); + model.setQuery(query); + + // a new search begins always on first page + model.getPagination().setFirstIndex(0); + + // get data from service + model.updateTabModel(isRemote(), getContext()); + + // update table model in ui + JApplicationListTab container = (JApplicationListTab) getUI(); + JTable table = container.getTable(); + JApplicationTableModel modelTab = (JApplicationTableModel) table.getModel(); + modelTab.setData(model.getList()); + + // refresh ui + getMainUI().refreshListTabUI(model, container); + } + + @Override + protected void clear() { + super.clear(); + query = null; + } } \ No newline at end of file

1 0

r501 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 14:42:09 +0000 (Thu, 24 Jan 2008) New Revision: 501 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java Log: rename variable Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java 2008-01-24 14:41:52 UTC (rev 500) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java 2008-01-24 14:42:09 UTC (rev 501) @@ -86,8 +86,8 @@ // update table model JApplicationListTab container = (JApplicationListTab) getUI(); - JTable jApplicationTable = container.getTable(); - JApplicationTableModel modelTab = (JApplicationTableModel) jApplicationTable.getModel(); + JTable table = container.getTable(); + JApplicationTableModel modelTab = (JApplicationTableModel) table.getModel(); modelTab.setData(model.getList()); // refresh ui

1 0

r500 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 14:41:52 +0000 (Thu, 24 Jan 2008) New Revision: 500 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java Log: refresh search text 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-01-24 14:14:35 UTC (rev 499) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java 2008-01-24 14:41:52 UTC (rev 500) @@ -87,6 +87,9 @@ SwingUtilities.invokeLater(new Runnable() { public void run() { + // refresh search text + ui.getSearchText().setText(model.getQuery()); + // refresh changePage combobox refreshChangePageCombo(ui, model);

1 0

r499 - in trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action: . application pagination
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 14:14:35 +0000 (Thu, 24 Jan 2008) New Revision: 499 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/application/AdvancedSearchApplicationAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/CollapseAllAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/DownloadAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ExpandAllAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ExportApplicationAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ImportApplicationAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/LaunchSynchronizeAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ResetSearchApplicationAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/SearchApplicationAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangeSizorAction.java Log: utilisation de deux constructeurs : un pour les actions tab sp?\195?\169cique ?\195?\160 un tab (les listes typiquement) un pour les actions tab non sp?\195?\169cifique ?\195?\160 un tab (rechercher, pagination,...) 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-01-24 13:51:38 UTC (rev 498) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractTabAction.java 2008-01-24 14:14:35 UTC (rev 499) @@ -45,23 +45,30 @@ protected SimExplorerAbstractTabAction(String name, String prefixPatternName) { super(name); - if (prefixPatternName != null) { - Pattern patternName = Pattern.compile(prefixPatternName + "_(\\w+)"); - Matcher matcher = patternName.matcher(name); - if (!matcher.matches()) { - throw new IllegalArgumentException(I18n._("{0} should have a name like this {1}, but was {2}", getClass().getName(), patternName, name)); - } + if (prefixPatternName == null) { + throw new IllegalArgumentException("prefixPatternName can not be null, but was."); + } - param = prefixPatternName; + Pattern patternName = Pattern.compile(prefixPatternName + "_(\\w+)"); + Matcher matcher = patternName.matcher(name); + if (!matcher.matches()) { + throw new IllegalArgumentException(I18n._("{0} should have a name like this {1}, but was {2}", getClass().getName(), patternName, name)); + } - Converter convertorLanguage = ConverterUtil.getConverter(SimExplorerTab.class); - tab = (SimExplorerTab) convertorLanguage.convert(SimExplorerTab.class, matcher.group(1)); - } else { - param = name; - } + param = prefixPatternName; + + Converter convertorLanguage = ConverterUtil.getConverter(SimExplorerTab.class); + tab = (SimExplorerTab) convertorLanguage.convert(SimExplorerTab.class, matcher.group(1)); + log.info(">>> " + this); } + protected SimExplorerAbstractTabAction(String name) { + super(name); + param = name; + log.info(">>> " + this); + } + public String getParam() { return param; } Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/AdvancedSearchApplicationAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/AdvancedSearchApplicationAction.java 2008-01-24 13:51:38 UTC (rev 498) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/AdvancedSearchApplicationAction.java 2008-01-24 14:14:35 UTC (rev 499) @@ -18,10 +18,8 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.application; -import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; +import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; -import javax.swing.JComboBox; - /** * Action pour réinitialiser une recherche d'application * @@ -36,19 +34,12 @@ mnemonic = 'v', hideActionText = true ) -public class AdvancedSearchApplicationAction extends SimExplorerAbstractAction { +public class AdvancedSearchApplicationAction extends SimExplorerAbstractTabAction { private static final long serialVersionUID = -155773498930710467L; public AdvancedSearchApplicationAction(String name) { super(name); - JComboBox c = null; - } - @Override - public void actionPerformed(java.awt.event.ActionEvent e) { - super.actionPerformed(e); - //TODO - } } \ No newline at end of file Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/CollapseAllAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/CollapseAllAction.java 2008-01-24 13:51:38 UTC (rev 498) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/CollapseAllAction.java 2008-01-24 14:14:35 UTC (rev 499) @@ -47,7 +47,7 @@ LoggableElementTreeNode node; public CollapseAllAction(String name) { - super(name, null); + super(name); } @Override Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/DownloadAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/DownloadAction.java 2008-01-24 13:51:38 UTC (rev 498) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/DownloadAction.java 2008-01-24 14:14:35 UTC (rev 499) @@ -56,7 +56,7 @@ private static final long serialVersionUID = 7535647131305304738L; - private static final MessageFormat FILENAME_PATTERN = new MessageFormat("{0}.xml"); + protected static final MessageFormat FILENAME_PATTERN = new MessageFormat("{0}.xml"); JTree tree; LoggableElementTreeNode node; File file; @@ -66,7 +66,7 @@ private static final int BUFFER_SIZE = 8 * 1024; public DownloadAction(String name) { - super(name, null); + super(name); } @Override @@ -100,7 +100,7 @@ @Override protected void doAction(ActionEvent e) throws Exception { super.doAction(e); - StorageService service = getStorageService(((DetailTabModel) getModel()).isRemote()); + StorageService service = getContext().getStorageService(((DetailTabModel) getModel()).isRemote()); RemoteInputStream ris = service.retrieveData(getContext().getToken(), uuid, version.toString(), "_xml"); if (ris == null) { // todo log error Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ExpandAllAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ExpandAllAction.java 2008-01-24 13:51:38 UTC (rev 498) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ExpandAllAction.java 2008-01-24 14:14:35 UTC (rev 499) @@ -47,7 +47,7 @@ LoggableElementTreeNode node; public ExpandAllAction(String name) { - super(name, null); + super(name); } @Override Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ExportApplicationAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ExportApplicationAction.java 2008-01-24 13:51:38 UTC (rev 498) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ExportApplicationAction.java 2008-01-24 14:14:35 UTC (rev 499) @@ -30,7 +30,6 @@ import javax.swing.JTree; import java.awt.event.ActionEvent; import java.io.File; -import java.text.MessageFormat; /** * Action pour exporter une application @@ -50,7 +49,6 @@ private static final long serialVersionUID = 7535647131305304738L; - private static final MessageFormat FILENAME_PATTERN = new MessageFormat("export-{0}.xml"); JTree tree; LoggableElementTreeNode node; File file; @@ -59,7 +57,7 @@ Version version; public ExportApplicationAction(String name) { - super(name, null); + super(name); } @Override @@ -85,7 +83,8 @@ super.doAction(e); //TODO Where to save (if local to remote and vice-versa ?) - StorageService service = getStorageService(((DetailTabModel) getModel()).isRemote()); + StorageService service = getContext().getStorageService(((DetailTabModel) getModel()).isRemote()); + service.exportElement(getContext().getToken(), null, uuid, version.toString()); } @@ -96,7 +95,7 @@ node = null; file = null; element = null; - version=null; - uuid=null; + version = null; + uuid = null; } } \ No newline at end of file Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ImportApplicationAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ImportApplicationAction.java 2008-01-24 13:51:38 UTC (rev 498) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ImportApplicationAction.java 2008-01-24 14:14:35 UTC (rev 499) @@ -18,7 +18,7 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.application; -import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; +import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; /** * Action de base pour importer une application @@ -34,7 +34,7 @@ mnemonic = 'i', hideActionText = false ) -public class ImportApplicationAction extends SimExplorerAbstractAction { +public class ImportApplicationAction extends SimExplorerAbstractTabAction { private static final long serialVersionUID = 3377670691203328711L; Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/LaunchSynchronizeAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/LaunchSynchronizeAction.java 2008-01-24 13:51:38 UTC (rev 498) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/LaunchSynchronizeAction.java 2008-01-24 14:14:35 UTC (rev 499) @@ -18,7 +18,7 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.application; -import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; +import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; /** * Action pouyr lancer la synchro @@ -33,7 +33,7 @@ smallIcon = "action/reload.png", hideActionText = false ) -public class LaunchSynchronizeAction extends SimExplorerAbstractAction { +public class LaunchSynchronizeAction extends SimExplorerAbstractTabAction { private static final long serialVersionUID = 8379937369551031306L; @@ -41,9 +41,4 @@ super(name); } - @Override - public void actionPerformed(java.awt.event.ActionEvent e) { - super.actionPerformed(e); - //TODO - } } \ No newline at end of file Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ResetSearchApplicationAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ResetSearchApplicationAction.java 2008-01-24 13:51:38 UTC (rev 498) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ResetSearchApplicationAction.java 2008-01-24 14:14:35 UTC (rev 499) @@ -18,7 +18,7 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.application; -import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; +import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; /** * Action pour réinitialiser une recherche d'application @@ -35,7 +35,7 @@ hideActionText = true, enabled = false ) -public class ResetSearchApplicationAction extends SimExplorerAbstractAction { +public class ResetSearchApplicationAction extends SimExplorerAbstractTabAction { private static final long serialVersionUID = -155773498930710467L; Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/SearchApplicationAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/SearchApplicationAction.java 2008-01-24 13:51:38 UTC (rev 498) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/SearchApplicationAction.java 2008-01-24 14:14:35 UTC (rev 499) @@ -19,6 +19,7 @@ package fr.cemagref.simexplorer.is.ui.swing.action.application; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; +import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; /** * Action pour lancer une recherche d'application @@ -35,7 +36,7 @@ hideActionText = true, enabled = false ) -public class SearchApplicationAction extends SimExplorerAbstractAction { +public class SearchApplicationAction extends SimExplorerAbstractTabAction { private static final long serialVersionUID = -8537587629478588257L; Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java 2008-01-24 13:51:38 UTC (rev 498) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java 2008-01-24 14:14:35 UTC (rev 499) @@ -52,7 +52,7 @@ protected Integer newPage; public ChangePageAction(String name) { - super(name, null); + super(name); } @Override Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangeSizorAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangeSizorAction.java 2008-01-24 13:51:38 UTC (rev 498) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangeSizorAction.java 2008-01-24 14:14:35 UTC (rev 499) @@ -47,7 +47,7 @@ protected Integer newWidth; public ChangeSizorAction(String name) { - super(name, null); + super(name); } @Override

1 0

r498 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 13:51:38 +0000 (Thu, 24 Jan 2008) New Revision: 498 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/ChangeI18nFRAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/ChangeI18nGBAction.java Log: i18n flags Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/ChangeI18nFRAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/ChangeI18nFRAction.java 2008-01-24 13:51:30 UTC (rev 497) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/ChangeI18nFRAction.java 2008-01-24 13:51:38 UTC (rev 498) @@ -27,7 +27,7 @@ shortDescription = "simexplorer.action.i18n.fr.tooltip", longDescription = "simexplorer.action.i18n.fr.help", mnemonic = 'F', - //smallIcon = "action/i18n.fr.png", + smallIcon = "action/i18n-fr.png", hideActionText = false ) public class ChangeI18nFRAction extends ChangeI18nAbstractAction { Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/ChangeI18nGBAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/ChangeI18nGBAction.java 2008-01-24 13:51:30 UTC (rev 497) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/ChangeI18nGBAction.java 2008-01-24 13:51:38 UTC (rev 498) @@ -27,7 +27,7 @@ shortDescription = "simexplorer.action.i18n.en.tooltip", longDescription = "simexplorer.action.i18n.en.help", mnemonic = 'n', - //smallIcon = "action/i18n-en.png", + smallIcon = "action/i18n-gb.png", hideActionText = false ) public class ChangeI18nGBAction extends ChangeI18nAbstractAction {

1 0

r497 - in trunk/simexplorer-is-swing/src/resources/icons: . action i18n
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 13:51:30 +0000 (Thu, 24 Jan 2008) New Revision: 497 Added: trunk/simexplorer-is-swing/src/resources/icons/action/i18n-fr.png trunk/simexplorer-is-swing/src/resources/icons/action/i18n-gb.png trunk/simexplorer-is-swing/src/resources/icons/i18n/ trunk/simexplorer-is-swing/src/resources/icons/i18n/be.png trunk/simexplorer-is-swing/src/resources/icons/i18n/ca.png trunk/simexplorer-is-swing/src/resources/icons/i18n/ch.png trunk/simexplorer-is-swing/src/resources/icons/i18n/de.png trunk/simexplorer-is-swing/src/resources/icons/i18n/dk.png trunk/simexplorer-is-swing/src/resources/icons/i18n/es.png trunk/simexplorer-is-swing/src/resources/icons/i18n/fi.png trunk/simexplorer-is-swing/src/resources/icons/i18n/it.png trunk/simexplorer-is-swing/src/resources/icons/i18n/nl.png trunk/simexplorer-is-swing/src/resources/icons/i18n/no.png trunk/simexplorer-is-swing/src/resources/icons/i18n/se.png trunk/simexplorer-is-swing/src/resources/icons/i18n/us.png Log: i18n flags Added: trunk/simexplorer-is-swing/src/resources/icons/action/i18n-fr.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/action/i18n-fr.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/simexplorer-is-swing/src/resources/icons/action/i18n-gb.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/action/i18n-gb.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/simexplorer-is-swing/src/resources/icons/i18n/be.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/i18n/be.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/simexplorer-is-swing/src/resources/icons/i18n/ca.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/i18n/ca.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/simexplorer-is-swing/src/resources/icons/i18n/ch.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/i18n/ch.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/simexplorer-is-swing/src/resources/icons/i18n/de.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/i18n/de.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/simexplorer-is-swing/src/resources/icons/i18n/dk.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/i18n/dk.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/simexplorer-is-swing/src/resources/icons/i18n/es.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/i18n/es.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/simexplorer-is-swing/src/resources/icons/i18n/fi.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/i18n/fi.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/simexplorer-is-swing/src/resources/icons/i18n/it.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/i18n/it.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/simexplorer-is-swing/src/resources/icons/i18n/nl.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/i18n/nl.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/simexplorer-is-swing/src/resources/icons/i18n/no.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/i18n/no.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/simexplorer-is-swing/src/resources/icons/i18n/se.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/i18n/se.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/simexplorer-is-swing/src/resources/icons/i18n/us.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/i18n/us.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream

1 0

r496 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 13:14:21 +0000 (Thu, 24 Jan 2008) New Revision: 496 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangeSizorAction.java Log: utilisation m?\195?\169thode updateTabModel Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java 2008-01-24 13:13:23 UTC (rev 495) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java 2008-01-24 13:14:21 UTC (rev 496) @@ -18,9 +18,7 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.pagination; -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; import fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; @@ -78,28 +76,20 @@ final ListTabModel model = (ListTabModel) getModel(); final PaginationModel pagination = model.getPagination(); - MetaDataEntity[] data; int width = pagination.getWidth(); long newFirstIndex = newPage * width; - //long newLastIndex = newFirstIndex + width; - //long oldFirstindex = pagination.getFirstIndex(); - //long oldLastIndex = oldFirstindex + model.size(); + // save new firstIndex in model + pagination.setFirstIndex(newFirstIndex); - //TODO optimiser l'algo - data = getData(getTab() == SimExplorerTab.remote, false, model.getQuery(), width, newFirstIndex, -1); + model.updateTabModel(isRemote(), getContext()); - // save in model - model.setList(data); - + // update table model JApplicationListTab container = (JApplicationListTab) getUI(); JTable jApplicationTable = container.getTable(); JApplicationTableModel modelTab = (JApplicationTableModel) jApplicationTable.getModel(); - modelTab.setData(data); + modelTab.setData(model.getList()); - // save new firstIndex in model - pagination.setFirstIndex(newFirstIndex); - // refresh ui getMainUI().refreshListTabUI(model, container); } Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangeSizorAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangeSizorAction.java 2008-01-24 13:13:23 UTC (rev 495) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangeSizorAction.java 2008-01-24 13:14:21 UTC (rev 496) @@ -18,8 +18,6 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.pagination; -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; import fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; @@ -77,28 +75,18 @@ // pour le moment, chaque retaille de fenetre repositionne // la liste à zero pour simplifier + pagination.setWidth(newWidth); + pagination.setFirstIndex(0); - long firstIndex = 0; - long lastIndex = newWidth; - if (lastIndex >= pagination.getSize()) { - lastIndex = pagination.getSize() - 1; - } - int size = (int) (lastIndex - firstIndex); + model.updateTabModel(isRemote(), getContext()); - MetaDataEntity[] data = getData(getTab() == SimExplorerTab.remote, false, model.getQuery(), size, (int) firstIndex, -1); - // save list - model.setList(data); // save in TableModel JApplicationListTab container = (JApplicationListTab) getUI(); JTable jApplicationTable = container.getTable(); JApplicationTableModel modelTab = (JApplicationTableModel) jApplicationTable.getModel(); - modelTab.setData(data); + modelTab.setData(model.getList()); - // save pagination - pagination.setWidth(newWidth); - pagination.setFirstIndex(0); - // refresh ui getMainUI().refreshListTabUI(model, container); }

1 0

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

24 Jan '08

Author: tchemit Date: 2008-01-24 13:13:23 +0000 (Thu, 24 Jan 2008) New Revision: 495 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java Log: comment 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-01-24 11:47:04 UTC (rev 494) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java 2008-01-24 13:13:23 UTC (rev 495) @@ -94,6 +94,7 @@ // get ui JApplicationDetailTab ui = (JApplicationDetailTab) getUI(); + // création de l'arbre TreeNode root = LoggableElementTreeHelper.buildLoggableElementNode(model.getBean()); // push tree model

1 0