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

r785 - trunk/simexplorer-is-swing
by tchemit＠users.labs.libre-entreprise.org 10 Feb '08

10 Feb '08

Author: tchemit Date: 2008-02-10 16:22:30 +0000 (Sun, 10 Feb 2008) New Revision: 785 Modified: trunk/simexplorer-is-swing/go.sh Log: on met les logs de maven dans target afin de ne pas polluer le projet Modified: trunk/simexplorer-is-swing/go.sh =================================================================== --- trunk/simexplorer-is-swing/go.sh 2008-02-09 17:06:35 UTC (rev 784) +++ trunk/simexplorer-is-swing/go.sh 2008-02-10 16:22:30 UTC (rev 785) @@ -18,7 +18,7 @@ COMPILE="" DEV="classes" OFF_LINE="-o " -MOUTPUT="maven.log" +MOUTPUT="target/maven.log" while true; do case "$1" in -k|--clean) @@ -101,6 +101,7 @@ if [ ! "$MVN_ACTION" = "" ]; then action="mvn -e $MVN_ACTION $OFF_LINE > $MOUTPUT" echo "$action" + mkdir target 2>/devl/null eval "$action" if [ $? != 0 ] ; then echo "error with maven :"

1 0

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

09 Feb '08

Author: tchemit Date: 2008-02-09 17:06:35 +0000 (Sat, 09 Feb 2008) New Revision: 784 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/actions/SimExplorerCommonActions.java Log: utilisateur getter Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/actions/SimExplorerCommonActions.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/actions/SimExplorerCommonActions.java 2008-02-09 16:36:22 UTC (rev 783) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/actions/SimExplorerCommonActions.java 2008-02-09 17:06:35 UTC (rev 784) @@ -51,8 +51,8 @@ protected void run() throws Exception { log.info("required help action"); StringWriter writer = new StringWriter(); - parser.printUsage(writer, "SimExplorer SI v " + getContext().getConfig().getVersion()); - printConfig(writer, parser.getMainConfig()); + getParser().printUsage(writer, "SimExplorer SI v " + getContext().getConfig().getVersion()); + printConfig(writer, getParser().getMainConfig()); writer.append('\n'); log.info(writer); getContext().setQuit(true);

1 0

r783 - in trunk/simexplorer-is-swing/src: java/fr/cemagref/simexplorer/is/ui java/fr/cemagref/simexplorer/is/ui/actions java/fr/cemagref/simexplorer/is/ui/swing/actions resources/i18n uimodel/fr/cemagref/simexplorer/is/ui/swing
by tchemit＠users.labs.libre-entreprise.org 09 Feb '08

09 Feb '08

Author: tchemit Date: 2008-02-09 16:36:22 +0000 (Sat, 09 Feb 2008) New Revision: 783 Removed: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JConfigUI.jaxx Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/actions/SimExplorerCommonActions.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConfigAction.java trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties Log: utilisation ui generique du commandline Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java 2008-02-09 16:10:53 UTC (rev 782) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java 2008-02-09 16:36:22 UTC (rev 783) @@ -18,7 +18,6 @@ * ##% */ package fr.cemagref.simexplorer.is.ui; -import fr.cemagref.simexplorer.is.ui.swing.JConfigUI; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerMainUI; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; @@ -26,6 +25,7 @@ import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; import org.codelutin.i18n.I18n; import org.codelutin.option.ui.ConfigTableModel; +import org.codelutin.option.ui.ConfigUI; import java.awt.event.ActionEvent; import java.io.IOException; @@ -59,7 +59,7 @@ public static void reloadUI() { ui = null; SimExplorerActionManager.resetCache(); - JConfigUI.reloadUI(); + ConfigUI.reloadUI(); SimExplorerTab.getFactory().resetCache(); // must remove listener on data model ? DetailTabModel detailModel = ((DetailTabModel) SimExplorerTab.detail.getModel()); @@ -145,7 +145,7 @@ // show edit config if first launch if (SimExplorer.context.isFirstLaunch()) { - JConfigUI.showUI(context.getConfig(), ConfigTableModel.TypeModel.all); + ConfigUI.showUI(context.getConfig(), ConfigTableModel.TypeModel.all); } // launch ui only if required Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/actions/SimExplorerCommonActions.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/actions/SimExplorerCommonActions.java 2008-02-09 16:10:53 UTC (rev 782) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/actions/SimExplorerCommonActions.java 2008-02-09 16:36:22 UTC (rev 783) @@ -22,12 +22,12 @@ import fr.cemagref.simexplorer.is.ui.configs.SimExplorerAbstractConfigMain; import fr.cemagref.simexplorer.is.ui.options.SimExplorerOptionEditConfig; import fr.cemagref.simexplorer.is.ui.options.SimExplorerOptionShowConfig; -import fr.cemagref.simexplorer.is.ui.swing.JConfigUI; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import static org.codelutin.i18n.I18n._; import org.codelutin.option.Config; import org.codelutin.option.ui.ConfigTableModel; +import org.codelutin.option.ui.ConfigUI; import java.io.IOException; import java.io.StringWriter; @@ -100,11 +100,11 @@ SimExplorerAbstractConfigMain conf; conf = getParser().getMainConfig(); if (isAll()) { - JConfigUI.showUI(conf, ConfigTableModel.TypeModel.all); + ConfigUI.showUI(conf, ConfigTableModel.TypeModel.all); } else if (isTec()) { - JConfigUI.showTechnicalUI(conf); + ConfigUI.showTechnicalUI(conf); } else { - JConfigUI.showUI(conf); + ConfigUI.showUI(conf); } StringWriter writer = new StringWriter(); Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConfigAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConfigAction.java 2008-02-09 16:10:53 UTC (rev 782) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConfigAction.java 2008-02-09 16:36:22 UTC (rev 783) @@ -18,9 +18,9 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.actions; -import fr.cemagref.simexplorer.is.ui.swing.JConfigUI; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction; import org.codelutin.option.ui.ConfigTableModel; +import org.codelutin.option.ui.ConfigUI; /** * Action pour afficher la dialogue de modification de configuration @@ -46,6 +46,6 @@ @Override public void doAction(java.awt.event.ActionEvent e) { - JConfigUI.showUI(getContext().getConfig(), ConfigTableModel.TypeModel.all); + ConfigUI.showUI(getContext().getConfig(), ConfigTableModel.TypeModel.all); } } \ No newline at end of file Modified: trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties =================================================================== --- trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-09 16:10:53 UTC (rev 782) +++ trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-09 16:36:22 UTC (rev 783) @@ -107,13 +107,10 @@ simexplorer.action.unconnect.help= simexplorer.action.unconnect.tooltip=Disconnect from remote server simexplorer.change.config.property= -simexplorer.common.cancel=cancel simexplorer.common.creationDate=create date simexplorer.common.description=description simexplorer.common.key=key simexplorer.common.name=name -simexplorer.common.ok=ok -simexplorer.common.reset=reset simexplorer.common.type=type simexplorer.common.value=value simexplorer.common.version=version @@ -137,7 +134,6 @@ simexplorer.config.main.userMail.description=User email adress simexplorer.config.main.version.description=Version of application simexplorer.config.menu=Configuration -simexplorer.config.title=SimExplorer SI configuration modifier simexplorer.error.load.actions.class=could not found for action key {0} class {1} simexplorer.error.load.actions.file=could not load actions.properties file for reason {0} simexplorer.error.unfound.config.property= Modified: trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties =================================================================== --- trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-09 16:10:53 UTC (rev 782) +++ trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-09 16:36:22 UTC (rev 783) @@ -107,13 +107,10 @@ simexplorer.action.unconnect.help= simexplorer.action.unconnect.tooltip=Se d\u00E9connecter du serveur distant simexplorer.change.config.property= -simexplorer.common.cancel=annuler simexplorer.common.creationDate=date de cr\u00E9ation simexplorer.common.description=description simexplorer.common.key=nom descriptor simexplorer.common.name=nom -simexplorer.common.ok=appliquer -simexplorer.common.reset=r\u00E9initialiser simexplorer.common.type=type simexplorer.common.value=valeur simexplorer.common.version=version @@ -137,7 +134,6 @@ simexplorer.config.main.userMail.description=Le courriel de l'utilisateur simexplorer.config.main.version.description=La version du logiciel simexplorer.config.menu=Configuration -simexplorer.config.title=SimExplorer SI Pr\u00E9f\u00E9rences simexplorer.error.load.actions.class=could not found for action key {0} class {1} simexplorer.error.load.actions.file=could not load actions.properties file for reason {0} simexplorer.error.unfound.config.property= Deleted: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JConfigUI.jaxx =================================================================== --- trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JConfigUI.jaxx 2008-02-09 16:10:53 UTC (rev 782) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JConfigUI.jaxx 2008-02-09 16:36:22 UTC (rev 783) @@ -1,149 +0,0 @@ -<JDialog title='{_("simexplorer.config.title")}' modal='true' defaultCloseOperation='DISPOSE_ON_CLOSE'> - <script> - import static org.codelutin.i18n.I18n._; - import org.codelutin.option.ui.ConfigTableModel; - import org.codelutin.option.ui.ConfigTableRenderer; - import org.codelutin.option.ui.ConfigTableEditor; - import org.codelutin.option.Config; - - private static JConfigUI instance; - - public static JConfigUI getInstance() { - if (instance == null) { - instance = new JConfigUI(); - } - return instance; - } - - public static void reloadUI() { - instance=null; - } - - public static void showUI(Config config) { - showUI(config,null); - } - - public static void showTechnicalUI(Config config) { - showUI(config, ConfigTableModel.TypeModel.tech); - } - - public static void showUI(Config config,ConfigTableModel.TypeModel type) { - getInstance().setConfig(config,type); - getInstance().setVisible(true); - } - - protected Config config; - protected ConfigTableModel model; - - private AbstractAction OK_ACTION; - private AbstractAction RESET_ACTION; - private AbstractAction CANCEL_ACTION; - private TableModelListener TABLE_MODEL_LISTENER; - - @Override - public void dispose() { - config=null; - if (model!=null) { - model.removeTableModelListener(TABLE_MODEL_LISTENER); - model = null; - } - super.dispose(); - } - - protected Config getConfig() { - return config; - } - - protected ConfigTableModel getModel() { - return model; - } - - protected boolean isEmpty() { - return model==null || config==null || config.getUniverse().isEmpty(); - } - - protected boolean isOkEnabled() { - return !isEmpty() && model.isValid(); - } - - protected boolean isResetEnabled() { - return !isEmpty() && model.isModified(); - } - - protected void setConfig(Config config, ConfigTableModel.TypeModel type) { - this.config = config; - model = new ConfigTableModel(config,type); - model.addTableModelListener(TABLE_MODEL_LISTENER); - main.setModel(model); - main.setDefaultRenderer(Object.class, new ConfigTableRenderer(model)); - main.getColumn(main.getColumnName(1)).setCellEditor(new ConfigTableEditor(getModel())); - boolean action = type != ConfigTableModel.TypeModel.tech; - butons.setVisible(action); - butons2.setVisible(!action); - model.fireTableDataChanged(); - pack(); - } - - OK_ACTION= new AbstractAction("OK") { - private static final long serialVersionUID = -5259317388353753566L; - public void actionPerformed(ActionEvent e) { - if (!isEmpty() && getModel().isModified()) { - getModel().transfertModified(getConfig()); - getConfig().saveSafely(); - } - dispose(); - } - }; - RESET_ACTION= new AbstractAction("Reset") { - private static final long serialVersionUID = 3780134639606303504L; - public void actionPerformed(ActionEvent e) { - getModel().reset(); - } - }; - CANCEL_ACTION = new AbstractAction("Cancel") { - private static final long serialVersionUID = -3391009906183633110L; - public void actionPerformed(ActionEvent e) { - dispose(); - } - }; - TABLE_MODEL_LISTENER = new TableModelListener() { - public void tableChanged(TableModelEvent e) { - SwingUtilities.invokeLater(new Runnable() { - public void run() { - processDataBinding("ok.enabled"); - processDataBinding("reset.enabled"); - } - }); - } - }; - JRootPane rootPane = getRootPane(); - rootPane.setDefaultButton(ok); - rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"), "cancel"); - rootPane.getActionMap().put("cancel", CANCEL_ACTION); - </script> - <Table weightx="1"> - <row> - <cell weighty="1" weightx='1' fill='both'> - <JScrollPane id='scroll' verticalScrollBarPolicy='20' horizontalScrollBarPolicy='31' > - <JTable id="main" rowSelectionAllowed="false" autoResizeMode='auto_resize_last_column'/> - </JScrollPane> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JPanel id='butons' visible='false' layout='{new GridLayout(0, 3, 2, 2)}'> - <JButton id='ok' text='{_("simexplorer.common.ok")}' enabled='{isOkEnabled()}' action='{OK_ACTION}'/> - <JButton id='reset' text='{_("simexplorer.common.reset")}' enabled='{isResetEnabled()}' action='{RESET_ACTION}'/> - <JButton id='cancel' text='{_("simexplorer.common.cancel")}' action='{CANCEL_ACTION}'/> - </JPanel> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JPanel id='butons2' visible='false' layout='{new GridLayout(0, 1, 2, 2)}'> - <JButton text='{_("simexplorer.common.ok")}' onActionPerformed='dispose();'/> - </JPanel> - </cell> - </row> - </Table> -</JDialog>

1 0

r782 - trunk/simexplorer-is-swing
by tchemit＠users.labs.libre-entreprise.org 09 Feb '08

09 Feb '08

Author: tchemit Date: 2008-02-09 16:10:53 +0000 (Sat, 09 Feb 2008) New Revision: 782 Modified: trunk/simexplorer-is-swing/pom.xml Log: utilisation librairie commandline Modified: trunk/simexplorer-is-swing/pom.xml =================================================================== --- trunk/simexplorer-is-swing/pom.xml 2008-02-09 16:10:08 UTC (rev 781) +++ trunk/simexplorer-is-swing/pom.xml 2008-02-09 16:10:53 UTC (rev 782) @@ -189,12 +189,19 @@ <artifactId>simexplorer-is-service</artifactId> <version>0.0.1-SNAPSHOT</version> </dependency> -  +  <dependency> <groupId>lutinlib</groupId> <artifactId>jaxx</artifactId> <version>1.0.4-SNAPSHOT</version> <scope>compile</scope> </dependency> +  + <dependency> + <groupId>lutinlib</groupId> + <artifactId>lutincommandline</artifactId> + <version>0.1-SNAPSHOT</version> + <scope>compile</scope> + </dependency> </dependencies> </project>

1 0

r781 - trunk/simexplorer-is
by tchemit＠users.labs.libre-entreprise.org 09 Feb '08

09 Feb '08

Author: tchemit Date: 2008-02-09 16:10:08 +0000 (Sat, 09 Feb 2008) New Revision: 781 Modified: trunk/simexplorer-is/pom.xml Log: utilisation variable Modified: trunk/simexplorer-is/pom.xml =================================================================== --- trunk/simexplorer-is/pom.xml 2008-02-09 00:31:43 UTC (rev 780) +++ trunk/simexplorer-is/pom.xml 2008-02-09 16:10:08 UTC (rev 781) @@ -122,7 +122,7 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> <configuration> - <outputEncoding>ISO-8859-1</outputEncoding> + <outputEncoding>${maven.compile.encoding}</outputEncoding> <locales>fr</locales> <siteDirectory>src/site</siteDirectory> <generateReports>false</generateReports>

1 0

r780 - trunk/simexplorer-is-swing/src/resources/i18n
by tchemit＠users.labs.libre-entreprise.org 09 Feb '08

09 Feb '08

Author: tchemit Date: 2008-02-09 00:31:43 +0000 (Sat, 09 Feb 2008) New Revision: 780 Modified: trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties Log: simplification clef i18n Modified: trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties =================================================================== --- trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-09 00:29:31 UTC (rev 779) +++ trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-09 00:31:43 UTC (rev 780) @@ -27,7 +27,6 @@ simexplorer.action.deleteLoggableElement=Delete loggable element simexplorer.action.deleteLoggableElement.help= simexplorer.action.deleteLoggableElement.tooltip=Delete loggable element ''{0}'' -simexplorer.action.dowloadLoggableElement.tooltip= simexplorer.action.downloadAttachment=Download Attachment simexplorer.action.downloadAttachment.help= simexplorer.action.downloadAttachment.tooltip=Download attachment ''{0}'' Modified: trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties =================================================================== --- trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-09 00:29:31 UTC (rev 779) +++ trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-09 00:31:43 UTC (rev 780) @@ -27,7 +27,6 @@ simexplorer.action.deleteLoggableElement=Supprimer le Loggable \u00E9l\u00E9ment simexplorer.action.deleteLoggableElement.help= simexplorer.action.deleteLoggableElement.tooltip=Supprimer le loggable \u00E9l\u00E9ment ''{0}'' -simexplorer.action.dowloadLoggableElement.tooltip= 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}''

1 0

r779 - trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab
by tchemit＠users.labs.libre-entreprise.org 09 Feb '08

09 Feb '08

Author: tchemit Date: 2008-02-09 00:29:31 +0000 (Sat, 09 Feb 2008) New Revision: 779 Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationListTab.jaxx Log: simplification clef i18n Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationListTab.jaxx =================================================================== --- trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationListTab.jaxx 2008-02-09 00:29:16 UTC (rev 778) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationListTab.jaxx 2008-02-09 00:29:31 UTC (rev 779) @@ -8,7 +8,7 @@ <cell fill='horizontal' insets='0,0,0,0'> <JToolBar> <JButton id='importApplication'/> - <JTextField id='searchText' toolTipText='{_("simexplorer.action.application.searchText.tooltip")}'/> + <JTextField id='searchText' toolTipText='{_("simexplorer.action.searchText.tooltip")}'/> <JButton id='searchApplication'/> <JButton id='resetSearchApplication'/> <JButton id='advancedSearchApplication'/> @@ -38,7 +38,7 @@ <JButton id='goFirstPage' enabled='{goPage.getSelectedIndex()>0}'/> <JButton id='goPreviousPage' enabled='{goPage.getSelectedIndex()>0}'/> <JPanel layout='{new GridLayout(0, 2, 0, 0)}'> - <JLabel id='currentPage' text='{_("simexplorer.action.pagination.currentPage")}' labelFor="{goPage}" font-size='9'/> + <JLabel id='currentPage' text='{_("simexplorer.action.currentPage")}' labelFor="{goPage}" font-size='9'/> <JComboBox id='goPage' enabled='false' font-size='9' opaque='false' preferredSize='{new Dimension(50,5)}'/> </JPanel> <JButton id='goNextPage'/>

1 0

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

09 Feb '08

Author: tchemit Date: 2008-02-09 00:29:16 +0000 (Sat, 09 Feb 2008) New Revision: 778 Removed: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteAction.java Log: actions de suppression Deleted: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteAction.java 2008-02-09 00:28:46 UTC (rev 777) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteAction.java 2008-02-09 00:29:16 UTC (rev 778) @@ -1,97 +0,0 @@ -/* -* ##% 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.swing.actions.util.SimExplorerAbstractTabAction; -import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeHelper; -import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode; -import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationDetailTab; - -import javax.swing.JTree; -import java.awt.event.ActionEvent; -import java.io.File; - -/** - * Action pour downloader un résultat ou une librairie - * - * @author chemit - */ - at jaxx.runtime.builder.ActionConfig( - actionCommand = "delete", - name = "simexplorer.action.application.delete", - shortDescription = "simexplorer.action.application.delete.tooltip", - longDescription = "simexplorer.action.application.delete.help", - smallIcon = "action/delete.png", - mnemonic = 'x', - hideActionText = true -) -public class DeleteAction extends SimExplorerAbstractTabAction { - - private static final long serialVersionUID = 7535647131305304738L; - - - JTree tree; - LoggableElementTreeNode node; - File file; - LoggableElement element; - String uuid; - Version version; - - public DeleteAction(String name) { - super(name); - } - - @Override - protected boolean beforeAction(ActionEvent e) throws Exception { - if (!super.beforeAction(e)) { - return false; - } - JApplicationDetailTab ui = (JApplicationDetailTab) getUI(); - tree = ui.getNavigationTree(); - node = LoggableElementTreeHelper.getSelectedNodeOrRootNode(tree); - boolean result; - result = LoggableElementTreeHelper.canDelete(node); - if (result) { - // ask user confirmation of node to delete - element = (LoggableElement) node.getUserObject(); - uuid = element.getMetaData().getUuid(); - version = element.getMetaData().getVersion(); - } - result = false; - return result; - } - - @Override - protected void doAction(ActionEvent e) throws Exception { - super.doAction(e); - } - - @Override - protected void clear() { - super.clear(); - tree = null; - node = null; - file = null; - element = null; - version = null; - uuid = null; - } -} \ No newline at end of file

1 0

r777 - in trunk/simexplorer-is-swing/src: java/fr/cemagref/simexplorer/is/ui/swing java/fr/cemagref/simexplorer/is/ui/swing/actions resources/i18n
by tchemit＠users.labs.libre-entreprise.org 09 Feb '08

09 Feb '08

Author: tchemit Date: 2008-02-09 00:28:46 +0000 (Sat, 09 Feb 2008) New Revision: 777 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/AdvancedSearchApplicationAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangePageAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeSizorAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CollapseAllAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadLoggableElementAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExpandAllAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportApplicationAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GoFirstPageAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GoLastPageAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GoNextPageAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GoPreviousPageAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ImportApplicationAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetSearchApplicationAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SearchApplicationAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties Log: simplification clef i18n Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java 2008-02-09 00:28:19 UTC (rev 776) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java 2008-02-09 00:28:46 UTC (rev 777) @@ -195,12 +195,14 @@ public static void refreshDetailActions(JApplicationDetailTab ui, DetailTabModel model, LoggableElementTreeNode node) { // refresh download LoggableElement button refreshDownloadLoggableElementAction(ui, model, node); - // refresh download Attachment button - refreshDownloadAttachmentAction(ui, model); // refresh delete button - refreshDeleteAction(ui, model); + refreshDeleteLoggableElementAction(ui, model); // refresh export button refreshExportAction(ui, model); + // refresh download Attachment button + refreshDownloadAttachmentAction(ui, model); + // refresh delete Attachment button + refreshDeleteAttachmentAction(ui, model); // refresh tree buttons refreshTreeActions(ui, node); } @@ -209,39 +211,47 @@ String tooltip; boolean enabled = node != null && !node.isLeaf() && node.getChildCount() > 0; - tooltip = !enabled ? null : _("simexplorer.action.application.collapseAll2", node.getUserObject()); + tooltip = !enabled ? null : _("simexplorer.action.collapseAll.tooltip", node.getUserObject()); updateButton(ui.getCollapseAllApplication(), enabled, tooltip); - tooltip = !enabled ? null : _("simexplorer.action.application.expandAll2.tooltip", node.getUserObject()); + tooltip = !enabled ? null : _("simexplorer.action.expandAll.tooltip", node.getUserObject()); updateButton(ui.getExpandAllApplication(), enabled, tooltip); } protected static void refreshDownloadLoggableElementAction(JApplicationDetailTab ui, DetailTabModel model, LoggableElementTreeNode node) { MetaData detail = model.getDetail(); boolean enabled = detail != null || LoggableElementTreeHelper.canDownload(node); - String tooltip = !enabled ? null : _("simexplorer.action.dowloadLoggableElement2", detail == null ? node.getUserObject() : detail.getName() + " - " + model.getSelectedVersion()); + String tooltip = !enabled ? null : _("simexplorer.action.downloadLoggableElement.tooltip", detail == null ? node.getUserObject() : detail.getName() + " - " + model.getSelectedVersion()); updateButton(ui.getDownloadLoggableElement(), enabled, tooltip); } + protected static void refreshDeleteLoggableElementAction(JApplicationDetailTab ui, DetailTabModel model) { + MetaData detail = model.getDetail(); + boolean enabled = detail != null; + String tooltip = !enabled ? null : _("simexplorer.action.deleteLoggableElement.tooltip", detail.getName() + " - " + model.getSelectedVersion()); + updateButton(ui.getDeleteLoggableElement(), enabled, tooltip); + } + public static void refreshDownloadAttachmentAction(JApplicationDetailTab ui, DetailTabModel model) { Attachment attachment = model.getSelectedAttachment(); MetaData detail = model.getDetail(); boolean enabled = detail != null && attachment != null; - String tooltip = !enabled ? null : _("simexplorer.action.dowloadAttachment2", attachment, detail.getName() + " - " + model.getSelectedVersion()); + String tooltip = !enabled ? null : _("simexplorer.action.downloadAttachment.tooltip", attachment); updateButton(ui.getDownloadAttachment(), enabled, tooltip); } - protected static void refreshDeleteAction(JApplicationDetailTab ui, DetailTabModel model) { + public static void refreshDeleteAttachmentAction(JApplicationDetailTab ui, DetailTabModel model) { + Attachment attachment = model.getSelectedAttachment(); MetaData detail = model.getDetail(); - boolean enabled = detail != null; - String tooltip = !enabled ? null : _("simexplorer.action.delete2", detail.getName() + " - " + model.getSelectedVersion()); - updateButton(ui.getDelete(), enabled, tooltip); + boolean enabled = detail != null && attachment != null; + String tooltip = !enabled ? null : _("simexplorer.action.deleteAttachment.tooltip", attachment); + updateButton(ui.getDeleteAttachment(), enabled, tooltip); } protected static void refreshExportAction(JApplicationDetailTab ui, DetailTabModel model) { MetaData detail = model.getDetail(); LoggableElement sNode = model.getSelectedNode(); boolean enabled = sNode != null && sNode instanceof ExplorationApplication; - String tooltip = !enabled ? null : _("simexplorer.action.export2", detail.getName() + " - " + model.getSelectedVersion()); + String tooltip = !enabled ? null : _("simexplorer.action.export.tooltip", detail.getName() + " - " + model.getSelectedVersion()); updateButton(ui.getExportApplication(), enabled, tooltip); } Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/AdvancedSearchApplicationAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/AdvancedSearchApplicationAction.java 2008-02-09 00:28:19 UTC (rev 776) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/AdvancedSearchApplicationAction.java 2008-02-09 00:28:46 UTC (rev 777) @@ -27,9 +27,9 @@ */ @jaxx.runtime.builder.ActionConfig( actionCommand = "advancedSearchApplication", - name = "simexplorer.action.application.advancedSearch", - shortDescription = "simexplorer.action.application.advancedSearch.tooltip", - longDescription = "simexplorer.action.application.advancedSearch.help", + name = "simexplorer.action.advancedSearch", + shortDescription = "simexplorer.action.advancedSearch.tooltip", + longDescription = "simexplorer.action.advancedSearch.help", smallIcon = "action/advanced-search.png", mnemonic = 'v', hideActionText = true Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangePageAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangePageAction.java 2008-02-09 00:28:19 UTC (rev 776) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangePageAction.java 2008-02-09 00:28:46 UTC (rev 777) @@ -41,9 +41,9 @@ */ @jaxx.runtime.builder.SelectActionConfig( actionCommand = "goPage", - name = "simexplorer.action.pagination.goPage", - shortDescription = "simexplorer.action.pagination.goPage.tooltip", - longDescription = "simexplorer.action.pagination.goPage.help", + name = "simexplorer.action.goPage", + shortDescription = "simexplorer.action.goPage.tooltip", + longDescription = "simexplorer.action.goPage.help", selectedIndex = -1 ) public class ChangePageAction extends SimExplorerAbstractTabAction { Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeSizorAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeSizorAction.java 2008-02-09 00:28:19 UTC (rev 776) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeSizorAction.java 2008-02-09 00:28:46 UTC (rev 777) @@ -37,9 +37,9 @@ */ @jaxx.runtime.builder.SelectActionConfig( actionCommand = "changeSizor", - name = "simexplorer.action.pagination.changeSizor", - shortDescription = "simexplorer.action.pagination.changeSizor.tooltip", - longDescription = "simexplorer.action.pagination.changeSizor.help", + name = "simexplorer.action.changeSizor", + shortDescription = "simexplorer.action.changeSizor.tooltip", + longDescription = "simexplorer.action.changeSizor.help", selectedIndex = -1 ) public class ChangeSizorAction extends SimExplorerAbstractTabAction { Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CollapseAllAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CollapseAllAction.java 2008-02-09 00:28:19 UTC (rev 776) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CollapseAllAction.java 2008-02-09 00:28:46 UTC (rev 777) @@ -33,9 +33,9 @@ */ @jaxx.runtime.builder.ActionConfig( actionCommand = "collapseAllApplication", - name = "simexplorer.action.application.collapseAll", - shortDescription = "simexplorer.action.application.collapseAll.tooltip", - longDescription = "simexplorer.action.application.collapseAll.help", + name = "simexplorer.action.collapseAll", + shortDescription = "simexplorer.action.collapseAll.tooltip", + longDescription = "simexplorer.action.collapseAll.help", smallIcon = "action/collapseAll.png", mnemonic = 'c', hideActionText = true Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java 2008-02-09 00:28:19 UTC (rev 776) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java 2008-02-09 00:28:46 UTC (rev 777) @@ -35,9 +35,9 @@ */ @jaxx.runtime.builder.ActionConfig( actionCommand = "downloadAttachment", - name = "simexplorer.action.application.downloadAttachment", - shortDescription = "simexplorer.action.application.downloadAttachment.tooltip", - longDescription = "simexplorer.action.application.downloadAttachment.help", + name = "simexplorer.action.downloadAttachment", + shortDescription = "simexplorer.action.downloadAttachment.tooltip", + longDescription = "simexplorer.action.downloadAttachment.help", smallIcon = "action/downloadAttachment.png", mnemonic = 'x', hideActionText = true Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadLoggableElementAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadLoggableElementAction.java 2008-02-09 00:28:19 UTC (rev 776) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadLoggableElementAction.java 2008-02-09 00:28:46 UTC (rev 777) @@ -35,9 +35,9 @@ */ @jaxx.runtime.builder.ActionConfig( actionCommand = "downloadLoggableElement", - name = "simexplorer.action.application.downloadLoggableElement", - shortDescription = "simexplorer.action.application.downloadLoggableElement.tooltip", - longDescription = "simexplorer.action.application.downloadLoggableElement.help", + name = "simexplorer.action.downloadLoggableElement", + shortDescription = "simexplorer.action.downloadLoggableElement.tooltip", + longDescription = "simexplorer.action.downloadLoggableElement.help", smallIcon = "action/downloadLoggableElement.png", mnemonic = 'x', hideActionText = true Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExpandAllAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExpandAllAction.java 2008-02-09 00:28:19 UTC (rev 776) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExpandAllAction.java 2008-02-09 00:28:46 UTC (rev 777) @@ -33,9 +33,9 @@ */ @jaxx.runtime.builder.ActionConfig( actionCommand = "expandAllApplication", - name = "simexplorer.action.application.expandAll", - shortDescription = "simexplorer.action.application.expandAll.tooltip", - longDescription = "simexplorer.action.application.expandAll.help", + name = "simexplorer.action.expandAll", + shortDescription = "simexplorer.action.expandAll.tooltip", + longDescription = "simexplorer.action.expandAll.help", smallIcon = "action/expandAll.png", mnemonic = 'e', hideActionText = true Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportApplicationAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportApplicationAction.java 2008-02-09 00:28:19 UTC (rev 776) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportApplicationAction.java 2008-02-09 00:28:46 UTC (rev 777) @@ -36,9 +36,9 @@ */ @jaxx.runtime.builder.ActionConfig( actionCommand = "exportApplication", - name = "simexplorer.action.application.export", - shortDescription = "simexplorer.action.application.export.tooltip", - longDescription = "simexplorer.action.application.export.help", + name = "simexplorer.action.export", + shortDescription = "simexplorer.action.export.tooltip", + longDescription = "simexplorer.action.export.help", smallIcon = "action/export-application.png", mnemonic = 'x', hideActionText = true Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GoFirstPageAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GoFirstPageAction.java 2008-02-09 00:28:19 UTC (rev 776) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GoFirstPageAction.java 2008-02-09 00:28:46 UTC (rev 777) @@ -29,9 +29,9 @@ */ @jaxx.runtime.builder.ActionConfig( actionCommand = "goFirstPage", - name = "simexplorer.action.pagination.goFirstPage", - shortDescription = "simexplorer.action.pagination.goFirstPage.tooltip", - longDescription = "simexplorer.action.pagination.goFirstPage.help", + name = "simexplorer.action.goFirstPage", + shortDescription = "simexplorer.action.goFirstPage.tooltip", + longDescription = "simexplorer.action.goFirstPage.help", smallIcon = "action/go-first.png", mnemonic = 'f', hideActionText = true Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GoLastPageAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GoLastPageAction.java 2008-02-09 00:28:19 UTC (rev 776) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GoLastPageAction.java 2008-02-09 00:28:46 UTC (rev 777) @@ -29,9 +29,9 @@ */ @jaxx.runtime.builder.ActionConfig( actionCommand = "goLastPage", - name = "simexplorer.action.pagination.goLastPage", - shortDescription = "simexplorer.action.pagination.goLastPage.tooltip", - longDescription = "simexplorer.action.pagination.goLastPage.help", + name = "simexplorer.action.goLastPage", + shortDescription = "simexplorer.action.goLastPage.tooltip", + longDescription = "simexplorer.action.goLastPage.help", smallIcon = "action/go-last.png", mnemonic = 'f', hideActionText = true Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GoNextPageAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GoNextPageAction.java 2008-02-09 00:28:19 UTC (rev 776) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GoNextPageAction.java 2008-02-09 00:28:46 UTC (rev 777) @@ -29,9 +29,9 @@ */ @jaxx.runtime.builder.ActionConfig( actionCommand = "goNextPage", - name = "simexplorer.action.pagination.goNextPage", - shortDescription = "simexplorer.action.pagination.goNextPage.tooltip", - longDescription = "simexplorer.action.pagination.goNextPage.help", + name = "simexplorer.action.goNextPage", + shortDescription = "simexplorer.action.goNextPage.tooltip", + longDescription = "simexplorer.action.goNextPage.help", smallIcon = "action/go-next.png", mnemonic = 'f', hideActionText = true Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GoPreviousPageAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GoPreviousPageAction.java 2008-02-09 00:28:19 UTC (rev 776) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GoPreviousPageAction.java 2008-02-09 00:28:46 UTC (rev 777) @@ -29,9 +29,9 @@ */ @jaxx.runtime.builder.ActionConfig( actionCommand = "goPreviousPage", - name = "simexplorer.action.pagination.goPreviousPage", - shortDescription = "simexplorer.action.pagination.goPreviousPage.tooltip", - longDescription = "simexplorer.action.pagination.goPreviousPage.help", + name = "simexplorer.action.goPreviousPage", + shortDescription = "simexplorer.action.goPreviousPage.tooltip", + longDescription = "simexplorer.action.goPreviousPage.help", smallIcon = "action/go-previous.png", mnemonic = 'f', hideActionText = true Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ImportApplicationAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ImportApplicationAction.java 2008-02-09 00:28:19 UTC (rev 776) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ImportApplicationAction.java 2008-02-09 00:28:46 UTC (rev 777) @@ -27,9 +27,9 @@ */ @jaxx.runtime.builder.ActionConfig( actionCommand = "importApplication", - name = "simexplorer.action.application.import", - shortDescription = "simexplorer.action.application.import.tooltip", - longDescription = "simexplorer.action.application.import.help", + name = "simexplorer.action.import", + shortDescription = "simexplorer.action.import.tooltip", + longDescription = "simexplorer.action.import.help", smallIcon = "action/import-application.png", mnemonic = 'i', hideActionText = false Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetSearchApplicationAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetSearchApplicationAction.java 2008-02-09 00:28:19 UTC (rev 776) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetSearchApplicationAction.java 2008-02-09 00:28:46 UTC (rev 777) @@ -34,9 +34,9 @@ */ @jaxx.runtime.builder.ActionConfig( actionCommand = "resetSearchApplication", - name = "simexplorer.action.application.resetSearch", - shortDescription = "simexplorer.action.application.resetSearch.tooltip", - longDescription = "simexplorer.action.application.resetSearch.help", + name = "simexplorer.action.resetSearch", + shortDescription = "simexplorer.action.resetSearch.tooltip", + longDescription = "simexplorer.action.resetSearch.help", smallIcon = "action/reset-search.png", mnemonic = 'e', hideActionText = true, Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SearchApplicationAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SearchApplicationAction.java 2008-02-09 00:28:19 UTC (rev 776) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SearchApplicationAction.java 2008-02-09 00:28:46 UTC (rev 777) @@ -35,9 +35,9 @@ */ @jaxx.runtime.builder.ActionConfig( actionCommand = "searchApplication", - name = "simexplorer.action.application.search", - shortDescription = "simexplorer.action.application.search.tooltip", - longDescription = "simexplorer.action.application.search.help", + name = "simexplorer.action.search", + shortDescription = "simexplorer.action.search.tooltip", + longDescription = "simexplorer.action.search.help", smallIcon = "action/search.png", mnemonic = 'e', hideActionText = true, Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java 2008-02-09 00:28:19 UTC (rev 776) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java 2008-02-09 00:28:46 UTC (rev 777) @@ -305,6 +305,7 @@ // again setEnabled(false); SimExplorerUIRefreshHelper.refreshDownloadAttachmentAction(ui, model); + SimExplorerUIRefreshHelper.refreshDeleteAttachmentAction(ui, model); setEnabled(wasEnable); } Modified: trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties =================================================================== --- trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-09 00:28:19 UTC (rev 776) +++ trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-09 00:28:46 UTC (rev 777) @@ -1,53 +1,60 @@ simexplorer.action.about=About simexplorer.action.about.help= simexplorer.action.about.tooltip=Show About dialog -simexplorer.action.application.advancedSearch=Advanced search -simexplorer.action.application.advancedSearch.help= -simexplorer.action.application.advancedSearch.tooltip=Show advanced search dialog -simexplorer.action.application.collapseAll=collapseAll -simexplorer.action.application.collapseAll.help= -simexplorer.action.application.collapseAll.tooltip=Collapse all nodes -simexplorer.action.application.collapseAll2= -simexplorer.action.application.delete=Delete -simexplorer.action.application.delete.help= -simexplorer.action.application.delete.tooltip=Delete selected item -simexplorer.action.application.downloadAttachment=Download Attachment -simexplorer.action.application.downloadAttachment.help= -simexplorer.action.application.downloadAttachment.tooltip=Click here to download the attachment -simexplorer.action.application.downloadLoggableElement=Download Loggable Element -simexplorer.action.application.downloadLoggableElement.help= -simexplorer.action.application.downloadLoggableElement.tooltip=Click here to download the complete loggable element as a Zip -simexplorer.action.application.expandAll=expandAll -simexplorer.action.application.expandAll.help=Expand all nodes -simexplorer.action.application.expandAll.tooltip= -simexplorer.action.application.expandAll2.tooltip=Expand all nodes of ''{0}'' -simexplorer.action.application.export=export -simexplorer.action.application.export.help= -simexplorer.action.application.export.tooltip=Export application -simexplorer.action.application.import=import -simexplorer.action.application.import.help= -simexplorer.action.application.import.tooltip=import application -simexplorer.action.application.resetSearch=reset -simexplorer.action.application.resetSearch.help= -simexplorer.action.application.resetSearch.tooltip=reset search -simexplorer.action.application.search=search -simexplorer.action.application.search.help= -simexplorer.action.application.search.tooltip=Launch search -simexplorer.action.application.searchText.tooltip=Text to search in applications +simexplorer.action.advancedSearch=Advanced search +simexplorer.action.advancedSearch.help= +simexplorer.action.advancedSearch.tooltip=Show advanced search dialog +simexplorer.action.changeSizor=Change Page size +simexplorer.action.changeSizor.help= +simexplorer.action.changeSizor.tooltip=Select the number of results to display in a page simexplorer.action.changeVersion.tooltip=Choose another version simexplorer.action.closeTab=close simexplorer.action.closeTab.help= simexplorer.action.closeTab.tooltip=close the tab +simexplorer.action.collapseAll=collapseAll +simexplorer.action.collapseAll.help= +simexplorer.action.collapseAll.tooltip=Collapse all nodes of ''{0}'' simexplorer.action.config=Preferences simexplorer.action.config.help= simexplorer.action.config.tooltip=Display the configuration modifier UI simexplorer.action.connect=Connect simexplorer.action.connect.help= simexplorer.action.connect.tooltip=Connect to remote server -simexplorer.action.delete2=Delete ''{0}'' -simexplorer.action.dowloadAttachment2=Download attachment ''{0}'' of ''{1}'' -simexplorer.action.dowloadLoggableElement2=Download Loggable Element ''{0}'' -simexplorer.action.export2=Export ''{0}'' +simexplorer.action.currentPage=page +simexplorer.action.deleteAttachment=Delete attachment +simexplorer.action.deleteAttachment.help= +simexplorer.action.deleteAttachment.tooltip=Delete attachment ''{0}'' +simexplorer.action.deleteLoggableElement=Delete loggable element +simexplorer.action.deleteLoggableElement.help= +simexplorer.action.deleteLoggableElement.tooltip=Delete loggable element ''{0}'' +simexplorer.action.dowloadLoggableElement.tooltip= +simexplorer.action.downloadAttachment=Download Attachment +simexplorer.action.downloadAttachment.help= +simexplorer.action.downloadAttachment.tooltip=Download attachment ''{0}'' +simexplorer.action.downloadLoggableElement=Download Loggable Element +simexplorer.action.downloadLoggableElement.help= +simexplorer.action.downloadLoggableElement.tooltip=Download Loggable Element ''{0}'' +simexplorer.action.expandAll=expandAll +simexplorer.action.expandAll.help=Expand all nodes +simexplorer.action.expandAll.tooltip=Expand all nodes of ''{0}'' +simexplorer.action.export=export +simexplorer.action.export.help= +simexplorer.action.export.tooltip=Export application +simexplorer.action.goFirstPage=First page +simexplorer.action.goFirstPage.help= +simexplorer.action.goFirstPage.tooltip=Access to first page in the list of results +simexplorer.action.goLastPage=Last page +simexplorer.action.goLastPage.help= +simexplorer.action.goLastPage.tooltip=Access to last page in the list of results +simexplorer.action.goNextPage=Next page +simexplorer.action.goNextPage.help= +simexplorer.action.goNextPage.tooltip=Access to next page in the list of results +simexplorer.action.goPage=Page +simexplorer.action.goPage.help= +simexplorer.action.goPage.tooltip=Select page to display in the list of results +simexplorer.action.goPreviousPage=Previous page +simexplorer.action.goPreviousPage.help= +simexplorer.action.goPreviousPage.tooltip=Access to previous page in the list of results simexplorer.action.help=Help simexplorer.action.help.help= simexplorer.action.help.tooltip=Show help dialog @@ -66,28 +73,19 @@ simexplorer.action.i18n.fr=French simexplorer.action.i18n.fr.help= simexplorer.action.i18n.fr.tooltip=Change to french language -simexplorer.action.pagination.changeSizor=Change Page size -simexplorer.action.pagination.changeSizor.help= -simexplorer.action.pagination.changeSizor.tooltip=Select the number of results to display in a page -simexplorer.action.pagination.currentPage=page -simexplorer.action.pagination.goFirstPage=First page -simexplorer.action.pagination.goFirstPage.help= -simexplorer.action.pagination.goFirstPage.tooltip=Access to first page in the list of results -simexplorer.action.pagination.goLastPage=Last page -simexplorer.action.pagination.goLastPage.help= -simexplorer.action.pagination.goLastPage.tooltip=Access to last page in the list of results -simexplorer.action.pagination.goNextPage=Next page -simexplorer.action.pagination.goNextPage.help= -simexplorer.action.pagination.goNextPage.tooltip=Access to next page in the list of results -simexplorer.action.pagination.goPage=Page -simexplorer.action.pagination.goPage.help= -simexplorer.action.pagination.goPage.tooltip=Select page to display in the list of results -simexplorer.action.pagination.goPreviousPage=Previous page -simexplorer.action.pagination.goPreviousPage.help= -simexplorer.action.pagination.goPreviousPage.tooltip=Access to previous page in the list of results +simexplorer.action.import=import +simexplorer.action.import.help= +simexplorer.action.import.tooltip=import application simexplorer.action.quit=Quit simexplorer.action.quit.help= simexplorer.action.quit.tooltip=Quit SimExplorer SI +simexplorer.action.resetSearch=reset +simexplorer.action.resetSearch.help= +simexplorer.action.resetSearch.tooltip=reset search +simexplorer.action.search=search +simexplorer.action.search.help= +simexplorer.action.search.tooltip=Launch search +simexplorer.action.searchText.tooltip=Text to search in applications simexplorer.action.show.detail=Application detail simexplorer.action.show.detail.help= simexplorer.action.show.detail.tooltip=show Detail of Application Modified: trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties =================================================================== --- trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-09 00:28:19 UTC (rev 776) +++ trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-09 00:28:46 UTC (rev 777) @@ -1,53 +1,60 @@ simexplorer.action.about=A propos simexplorer.action.about.help= simexplorer.action.about.tooltip=Afficher les cr\u00E9dits -simexplorer.action.application.advancedSearch=Recherche avanc\u00E9e -simexplorer.action.application.advancedSearch.help= -simexplorer.action.application.advancedSearch.tooltip=Cliquer pour afficher le recherche avanc\u00E9e -simexplorer.action.application.collapseAll=tout r\u00E9duire -simexplorer.action.application.collapseAll.help= -simexplorer.action.application.collapseAll.tooltip=R\u00E9duire tous les noeuds -simexplorer.action.application.collapseAll2= -simexplorer.action.application.delete=Supprimer -simexplorer.action.application.delete.help= -simexplorer.action.application.delete.tooltip=Supprimer l'\u00E9l\u00E9ment s\u00E9lectionn\u00E9 -simexplorer.action.application.downloadAttachment=T\u00E9l\u00E9charger le fichier attach\u00E9 -simexplorer.action.application.downloadAttachment.help= -simexplorer.action.application.downloadAttachment.tooltip=Cliquer ici pour t\u00E9l\u00E9charger le fichier attach\u00E9 -simexplorer.action.application.downloadLoggableElement=T\u00E9l\u00E9charger le zip -simexplorer.action.application.downloadLoggableElement.help= -simexplorer.action.application.downloadLoggableElement.tooltip=Cliquer ici pour t\u00E9l\u00E9charger le Zip du LoggableElement -simexplorer.action.application.expandAll=tout d\u00E9rouler -simexplorer.action.application.expandAll.help= -simexplorer.action.application.expandAll.tooltip=\u00E9taler tous les noeuds -simexplorer.action.application.expandAll2.tooltip=\u00E9taler tous les noeuds de ''{0}'' -simexplorer.action.application.export=exporter -simexplorer.action.application.export.help= -simexplorer.action.application.export.tooltip=Exporter une application -simexplorer.action.application.import=importer -simexplorer.action.application.import.help= -simexplorer.action.application.import.tooltip=Importer une application -simexplorer.action.application.resetSearch=r\u00E9initialiser -simexplorer.action.application.resetSearch.help= -simexplorer.action.application.resetSearch.tooltip=R\u00E9initialiser la recherche -simexplorer.action.application.search=chercher -simexplorer.action.application.search.help= -simexplorer.action.application.search.tooltip=Lancer la recherche -simexplorer.action.application.searchText.tooltip=Le texte de recherche +simexplorer.action.advancedSearch=Recherche avanc\u00E9e +simexplorer.action.advancedSearch.help= +simexplorer.action.advancedSearch.tooltip=Cliquer pour afficher le recherche avanc\u00E9e +simexplorer.action.changeSizor=Change fen\u00EAtre +simexplorer.action.changeSizor.help= +simexplorer.action.changeSizor.tooltip=Choisir le nombre de r\u00E9sultats par page simexplorer.action.changeVersion.tooltip=Choisir une autre version simexplorer.action.closeTab=Fermer simexplorer.action.closeTab.help= simexplorer.action.closeTab.tooltip=Fermer l'onglet +simexplorer.action.collapseAll=tout r\u00E9duire +simexplorer.action.collapseAll.help= +simexplorer.action.collapseAll.tooltip=R\u00E9duire tous les noeuds de ''{0}'' simexplorer.action.config=Pr\u00E9f\u00E9rences simexplorer.action.config.help= simexplorer.action.config.tooltip=Afficher le dialogue de modification de configuration simexplorer.action.connect=Connexion simexplorer.action.connect.help= simexplorer.action.connect.tooltip=Se connecter au serveur distant -simexplorer.action.delete2=Supprimer ''{0}'' -simexplorer.action.dowloadAttachment2=T\u00E9l\u00E9charger le fichier attach\u00E9 ''{0}'' de''{1}'' -simexplorer.action.dowloadLoggableElement2=T\u00E9l\u00E9charger le zip du Loggable Element ''{0}'' -simexplorer.action.export2=Exporter ''{0}'' +simexplorer.action.currentPage=page +simexplorer.action.deleteAttachment=Supprimer le fichier attach\u00E9 +simexplorer.action.deleteAttachment.help= +simexplorer.action.deleteAttachment.tooltip=Supprimer le fichier attach\u00E9 ''{0}'' +simexplorer.action.deleteLoggableElement=Supprimer le Loggable \u00E9l\u00E9ment +simexplorer.action.deleteLoggableElement.help= +simexplorer.action.deleteLoggableElement.tooltip=Supprimer le loggable \u00E9l\u00E9ment ''{0}'' +simexplorer.action.dowloadLoggableElement.tooltip= +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}'' +simexplorer.action.downloadLoggableElement=T\u00E9l\u00E9charger le zip +simexplorer.action.downloadLoggableElement.help= +simexplorer.action.downloadLoggableElement.tooltip=T\u00E9l\u00E9charger le zip du Loggable Element ''{0}'' +simexplorer.action.expandAll=tout d\u00E9rouler +simexplorer.action.expandAll.help= +simexplorer.action.expandAll.tooltip=\u00E9taler tous les noeuds de ''{0}'' +simexplorer.action.export=exporter +simexplorer.action.export.help= +simexplorer.action.export.tooltip=Exporter ''{0}'' +simexplorer.action.goFirstPage=Premi\u00E8re page +simexplorer.action.goFirstPage.help= +simexplorer.action.goFirstPage.tooltip=Acc\u00E9der \u00E0 la premi\u00E8re page de la liste des r\u00E9sultats +simexplorer.action.goLastPage=Derni\u00E8re Page +simexplorer.action.goLastPage.help= +simexplorer.action.goLastPage.tooltip=Acc\u00E9der \u00E0 la derni\u00E8re page de la liste des r\u00E9sultats +simexplorer.action.goNextPage=Prochaine page +simexplorer.action.goNextPage.help= +simexplorer.action.goNextPage.tooltip=Acc\u00E9der \u00E0 la prochaine page de la liste des r\u00E9sultats +simexplorer.action.goPage=Page +simexplorer.action.goPage.help= +simexplorer.action.goPage.tooltip=Choisir la page \u00E0 acc\u00E9der dans la liste des r\u00E9sultats +simexplorer.action.goPreviousPage=Pr\u00E9c\u00E9dente page +simexplorer.action.goPreviousPage.help= +simexplorer.action.goPreviousPage.tooltip=Acc\u00E9der \u00E0 la page pr\u00E9c\u00E9dente de la liste des r\u00E9sultats simexplorer.action.help=Aide simexplorer.action.help.help= simexplorer.action.help.tooltip=Acc\u00E9der \u00E0 l'aide @@ -66,28 +73,19 @@ simexplorer.action.i18n.fr=Fran\u00E7ais simexplorer.action.i18n.fr.help= simexplorer.action.i18n.fr.tooltip=Traduire l'application en fran\u00E7ais -simexplorer.action.pagination.changeSizor=Change fen\u00EAtre -simexplorer.action.pagination.changeSizor.help= -simexplorer.action.pagination.changeSizor.tooltip=Choisir le nombre de r\u00E9sultats par page -simexplorer.action.pagination.currentPage=page -simexplorer.action.pagination.goFirstPage=Premi\u00E8re page -simexplorer.action.pagination.goFirstPage.help= -simexplorer.action.pagination.goFirstPage.tooltip=Acc\u00E9der \u00E0 la premi\u00E8re page de la liste des r\u00E9sultats -simexplorer.action.pagination.goLastPage=Derni\u00E8re Page -simexplorer.action.pagination.goLastPage.help= -simexplorer.action.pagination.goLastPage.tooltip=Acc\u00E9der \u00E0 la derni\u00E8re page de la liste des r\u00E9sultats -simexplorer.action.pagination.goNextPage=Prochaine page -simexplorer.action.pagination.goNextPage.help= -simexplorer.action.pagination.goNextPage.tooltip=Acc\u00E9der \u00E0 la prochaine page de la liste des r\u00E9sultats -simexplorer.action.pagination.goPage=Page -simexplorer.action.pagination.goPage.help= -simexplorer.action.pagination.goPage.tooltip=Choisir la page \u00E0 acc\u00E9der dans la liste des r\u00E9sultats -simexplorer.action.pagination.goPreviousPage=Pr\u00E9c\u00E9dente page -simexplorer.action.pagination.goPreviousPage.help= -simexplorer.action.pagination.goPreviousPage.tooltip=Acc\u00E9der \u00E0 la page pr\u00E9c\u00E9dente de la liste des r\u00E9sultats +simexplorer.action.import=importer +simexplorer.action.import.help= +simexplorer.action.import.tooltip=Importer une application simexplorer.action.quit=Quitter simexplorer.action.quit.help= simexplorer.action.quit.tooltip=Pour quitter l'application +simexplorer.action.resetSearch=r\u00E9initialiser +simexplorer.action.resetSearch.help= +simexplorer.action.resetSearch.tooltip=R\u00E9initialiser la recherche +simexplorer.action.search=chercher +simexplorer.action.search.help= +simexplorer.action.search.tooltip=Lancer la recherche +simexplorer.action.searchText.tooltip=Le texte de recherche simexplorer.action.show.detail=D\u00E9tail simexplorer.action.show.detail.help= simexplorer.action.show.detail.tooltip=Affcihier les d\u00E9tail de l'application

1 0

r776 - in trunk/simexplorer-is-swing/src: java/fr/cemagref/simexplorer/is/ui/swing/actions java/fr/cemagref/simexplorer/is/ui/swing/actions/util resources uimodel/fr/cemagref/simexplorer/is/ui/swing/tab
by tchemit＠users.labs.libre-entreprise.org 09 Feb '08

09 Feb '08

Author: tchemit Date: 2008-02-09 00:28:19 +0000 (Sat, 09 Feb 2008) New Revision: 776 Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteAttachmentAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteLoggableElementAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/DeleteAbstractAction.java Modified: trunk/simexplorer-is-swing/src/resources/actions.properties trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx Log: actions de suppression Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteAttachmentAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteAttachmentAction.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteAttachmentAction.java 2008-02-09 00:28:19 UTC (rev 776) @@ -0,0 +1,72 @@ +/* +* ##% 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.attachment.Attachment; +import fr.cemagref.simexplorer.is.ui.swing.actions.util.DeleteAbstractAction; +import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; + +import java.awt.event.ActionEvent; + +/** + * Action pour downloader un résultat ou une librairie + * + * @author chemit + */ + at jaxx.runtime.builder.ActionConfig( + actionCommand = "deleteAttachment", + name = "simexplorer.action.deleteAttachment", + shortDescription = "simexplorer.action.deleteAttachment.tooltip", + longDescription = "simexplorer.action.deleteAttachment.help", + smallIcon = "action/delete.png", + mnemonic = 'x', + hideActionText = true +) +public class DeleteAttachmentAction extends DeleteAbstractAction { + + protected Attachment attachment; + private static final long serialVersionUID = 7535647131305304738L; + + + public DeleteAttachmentAction(String name) { + super(name); + } + + @Override + protected boolean beforeAction(ActionEvent e) throws Exception { + return super.beforeAction(e) && attachment != null; + } + + @Override + protected void initModel(DetailTabModel model) { + super.initModel(model); + attachment = model.getSelectedAttachment(); + } + + @Override + protected void doAction(ActionEvent e) throws Exception { + super.doAction(e); + } + + @Override + protected void clear() { + super.clear(); + attachment = null; + } +} \ No newline at end of file Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteLoggableElementAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteLoggableElementAction.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteLoggableElementAction.java 2008-02-09 00:28:19 UTC (rev 776) @@ -0,0 +1,59 @@ +/* +* ##% 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.swing.actions.util.SimExplorerAbstractTabAction; +import fr.cemagref.simexplorer.is.ui.swing.actions.util.DeleteAbstractAction; +import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeHelper; +import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode; +import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationDetailTab; + +import javax.swing.JTree; +import java.awt.event.ActionEvent; +import java.io.File; + +/** + * Action pour downloader un résultat ou une librairie + * + * @author chemit + */ + at jaxx.runtime.builder.ActionConfig( + actionCommand = "deleteLoggableElement", + name = "simexplorer.action.deleteLoggableElement", + shortDescription = "simexplorer.action.deleteLoggableElement.tooltip", + longDescription = "simexplorer.action.deleteLoggableElement.help", + smallIcon = "action/delete.png", + mnemonic = 'x', + hideActionText = true +) +public class DeleteLoggableElementAction extends DeleteAbstractAction { + private static final long serialVersionUID = 5227114960042141191L; + + public DeleteLoggableElementAction(String name) { + super(name); + } + + @Override + protected void doAction(ActionEvent e) throws Exception { + super.doAction(e); + //TODO delete + } +} \ No newline at end of file Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/DeleteAbstractAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/DeleteAbstractAction.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/DeleteAbstractAction.java 2008-02-09 00:28:19 UTC (rev 776) @@ -0,0 +1,89 @@ +/* +* ##% 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.util; + +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; +import fr.cemagref.simexplorer.is.entities.metadata.Version; +import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; + +import java.awt.event.ActionEvent; + +/** + * Action pour deleter un loggableElement ou attachment + * + * @author chemit + */ +public abstract class DeleteAbstractAction extends SimExplorerAbstractTabAction { + + private static final long serialVersionUID = 7535647131305304738L; + + MetaData element; + String uuid; + Version version; + + protected DeleteAbstractAction(String name) { + super(name); + } + + + protected void initModel(DetailTabModel model) { + element = model.getDetail(); + version = model.getSelectedVersion(); + uuid = element.getUuid(); + } + + protected MetaData getElement() { + return element; + } + + protected String getUuid() { + return uuid; + } + + protected Version getVersion() { + return version; + } + + @Override + protected boolean beforeAction(ActionEvent e) throws Exception { + if (!super.beforeAction(e)) { + return false; + } + DetailTabModel model = ((DetailTabModel) getModel()); + boolean result; + // init from model + initModel(model); + result = element != null && version != null; + return result; + } + + @Override + protected void doAction(ActionEvent e) throws Exception { + super.doAction(e); + } + + @Override + protected void clear() { + super.clear(); + element = null; + version = null; + uuid = null; + } + +} \ No newline at end of file Modified: trunk/simexplorer-is-swing/src/resources/actions.properties =================================================================== --- trunk/simexplorer-is-swing/src/resources/actions.properties 2008-02-08 23:42:07 UTC (rev 775) +++ trunk/simexplorer-is-swing/src/resources/actions.properties 2008-02-09 00:28:19 UTC (rev 776) @@ -37,7 +37,8 @@ action.expandAllApplication=fr.cemagref.simexplorer.is.ui.swing.actions.ExpandAllAction action.downloadLoggableElement=fr.cemagref.simexplorer.is.ui.swing.actions.DownloadLoggableElementAction action.downloadAttachment=fr.cemagref.simexplorer.is.ui.swing.actions.DownloadAttachmentAction -action.delete=fr.cemagref.simexplorer.is.ui.swing.actions.DeleteAction +action.deleteLoggableElement=fr.cemagref.simexplorer.is.ui.swing.actions.DeleteLoggableElementAction +action.deleteAttachment=fr.cemagref.simexplorer.is.ui.swing.actions.DeleteAttachmentAction action.exportApplication=fr.cemagref.simexplorer.is.ui.swing.actions.ExportApplicationAction action.importApplication=fr.cemagref.simexplorer.is.ui.swing.actions.ImportApplicationAction Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx =================================================================== --- trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx 2008-02-08 23:42:07 UTC (rev 775) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx 2008-02-09 00:28:19 UTC (rev 776) @@ -41,7 +41,7 @@ <JToolBar> <JButton id='exportApplication'/> <JButton id='downloadLoggableElement'/> - <JButton id='delete'/> + <JButton id='deleteLoggableElement'/> </JToolBar> </cell> </row> @@ -122,6 +122,7 @@ <cell fill='horizontal' anchor="east"> <JToolBar> <JButton id='downloadAttachment'/> + <JButton id='deleteAttachment'/> </JToolBar> </cell> </row>

1 0