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