This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 8d4b9cb80a5450ee11da3b0f09811fe7d6a24ea0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 11 22:30:05 2015 +0100 correction des actions simples manquantes --- .../operation/catches/MultiPostImportLogDialog.css | 2 +- .../catches/MultiPostImportLogDialog.jaxx | 3 +- .../catches/species/ImportPupitriPopupUI.css | 2 + .../catches/species/ImportPupitriPopupUI.jaxx | 4 +- .../species/ImportPupitriPopupUIHandler.java | 26 +------------ .../species/actions/ImportPupitriAction.java | 3 +- .../actions/ImportPupitriPopupCancelAction.java | 28 ++++++++++++++ .../actions/ImportPupitriPopupValidateAction.java | 45 ++++++++++++++++++++++ .../MultiPostImportLogCloseDialogAction.java | 24 ++++++++++++ .../replace/AbstractReplaceTemporaryUI.css | 1 + .../replace/AbstractReplaceTemporaryUI.jaxx | 2 +- .../replace/actions/CloseReplaceUIAction.java | 27 +++++++++++++ 12 files changed, 134 insertions(+), 33 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.css index ed02da0..0bc6201 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.css @@ -45,5 +45,5 @@ text: "tutti.multiPostImportLog.close"; toolTipText: "tutti.multiPostImportLog.close.tip"; i18nMnemonic: "tutti.multiPostImportLog.close.mnemonic"; - _skipAction: true; + _simpleaction: {fr.ifremer.tutti.ui.swing.content.operation.catches.species.actions.MultiPostImportLogCloseDialogAction.class}; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.jaxx index ff4ea83..6039ed1 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.jaxx @@ -27,7 +27,6 @@ <JTextArea id="batchList"/> </JScrollPane> - <JButton id="closeButton" constraints='BorderLayout.SOUTH' - onActionPerformed='dispose();'/> + <JButton id="closeButton" constraints='BorderLayout.SOUTH'/> </JDialog> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.css index 4630a75..3b0de25 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.css @@ -56,6 +56,7 @@ FileEditor { text: "tutti.common.cancel"; toolTipText: "tutti.common.cancel"; i18nMnemonic: "tutti.common.cancel.mnemonic"; + _simpleAction: {fr.ifremer.tutti.ui.swing.content.operation.catches.species.actions.ImportPupitriPopupCancelAction.class}; } #validateButton { @@ -63,5 +64,6 @@ FileEditor { text: "tutti.common.validate"; toolTipText: "tutti.common.validate"; i18nMnemonic: "tutti.common.validate.mnemonic"; + _simpleAction: {fr.ifremer.tutti.ui.swing.content.operation.catches.species.actions.ImportPupitriPopupValidateAction.class}; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.jaxx index c6db5c9..1e88b04 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.jaxx @@ -63,8 +63,8 @@ public void open() { <row> <cell columns='2'> <JPanel layout='{new GridLayout(1,0)}'> - <JButton id='cancelButton' onActionPerformed='handler.cancel()'/> - <JButton id='validateButton' onActionPerformed='handler.validate()'/> + <JButton id='cancelButton'/> + <JButton id='validateButton'/> </JPanel> </cell> </row> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIHandler.java index 0cb0e8a..304ad95 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIHandler.java @@ -29,11 +29,8 @@ import jaxx.runtime.spi.UIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.JOptionPane; import java.io.File; -import static org.nuiton.i18n.I18n.t; - /** * @author kmorin <morin@codelutin.com> * @author tchemit <chemit@codelutin.com> @@ -133,28 +130,7 @@ public class ImportPupitriPopupUIHandler implements UIHandler<ImportPupitriPopup ui.setVisible(true); } - public void cancel() { - resetFields(); - ui.dispose(); - } - - public void validate() { - if (ui.getTrunkFile().getSelectedFile() != null - && ui.getTrunkFile().getSelectedFile().exists() - && ui.getCarrouselFile().getSelectedFile() != null - && ui.getCarrouselFile().getSelectedFile().exists()) { - - ui.dispose(); - - } else { - JOptionPane.showMessageDialog(ui, - t("tutti.importPupitri.error.fileMissing.message"), - t("tutti.importPupitri.error.fileMissing.title"), - JOptionPane.ERROR_MESSAGE); - } - } - - protected void resetFields() { + public void resetFields() { ui.getTrunkFile().setSelectedFilePath(null); ui.getCarrouselFile().setSelectedFilePath(null); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriAction.java index 17b3ea3..74162aa 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriAction.java @@ -140,8 +140,7 @@ public class ImportPupitriAction extends LongActionSupport<SpeciesBatchUIModel, importPupitriDialog.open(); importedTrunkFile = importPupitriDialog.getTrunkFile().getSelectedFile(); importedCarrouselFile = importPupitriDialog.getCarrouselFile().getSelectedFile(); - result = importedTrunkFile != null - && importedCarrouselFile != null; + result = importedTrunkFile != null && importedCarrouselFile != null; } return result; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriPopupCancelAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriPopupCancelAction.java new file mode 100644 index 0000000..4aef8ba --- /dev/null +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriPopupCancelAction.java @@ -0,0 +1,28 @@ +package fr.ifremer.tutti.ui.swing.content.operation.catches.species.actions; + +import fr.ifremer.tutti.ui.swing.content.operation.catches.species.ImportPupitriPopupUI; +import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; + +/** + * Created on 3/11/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 3.15 + */ +public class ImportPupitriPopupCancelAction extends SimpleActionSupport<ImportPupitriPopupUI> { + + private static final long serialVersionUID = 1L; + + public ImportPupitriPopupCancelAction(ImportPupitriPopupUI ui) { + super(ui); + } + + @Override + protected void onActionPerformed(ImportPupitriPopupUI ui) { + + ui.getTrunkFile().setSelectedFilePath(null); + ui.getCarrouselFile().setSelectedFilePath(null); + ui.dispose(); + + } +} diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriPopupValidateAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriPopupValidateAction.java new file mode 100644 index 0000000..3404580 --- /dev/null +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriPopupValidateAction.java @@ -0,0 +1,45 @@ +package fr.ifremer.tutti.ui.swing.content.operation.catches.species.actions; + +import fr.ifremer.tutti.ui.swing.content.operation.catches.species.ImportPupitriPopupUI; +import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; + +import javax.swing.JOptionPane; + +import java.io.File; + +import static org.nuiton.i18n.I18n.t; + +/** + * Created on 3/11/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 3.15 + */ +public class ImportPupitriPopupValidateAction extends SimpleActionSupport<ImportPupitriPopupUI> { + + private static final long serialVersionUID = 1L; + + public ImportPupitriPopupValidateAction(ImportPupitriPopupUI ui) { + super(ui); + } + + @Override + protected void onActionPerformed(ImportPupitriPopupUI ui) { + + File trunkFile = ui.getTrunkFile().getSelectedFile(); + File carousselFile = ui.getCarrouselFile().getSelectedFile(); + if (trunkFile != null && trunkFile.exists() && carousselFile != null && carousselFile.exists()) { + + ui.dispose(); + + } else { + + JOptionPane.showMessageDialog(ui, + t("tutti.importPupitri.error.fileMissing.message"), + t("tutti.importPupitri.error.fileMissing.title"), + JOptionPane.ERROR_MESSAGE); + + } + + } +} diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/MultiPostImportLogCloseDialogAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/MultiPostImportLogCloseDialogAction.java new file mode 100644 index 0000000..61ef6b9 --- /dev/null +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/MultiPostImportLogCloseDialogAction.java @@ -0,0 +1,24 @@ +package fr.ifremer.tutti.ui.swing.content.operation.catches.species.actions; + +import fr.ifremer.tutti.ui.swing.content.operation.catches.MultiPostImportLogDialog; +import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; + +/** + * Created on 3/11/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 3.15 + */ +public class MultiPostImportLogCloseDialogAction extends SimpleActionSupport<MultiPostImportLogDialog> { + + private static final long serialVersionUID = 1L; + + public MultiPostImportLogCloseDialogAction(MultiPostImportLogDialog ui) { + super(ui); + } + + @Override + protected void onActionPerformed(MultiPostImportLogDialog ui) { + ui.dispose(); + } +} diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUI.css index 82bcf0c..0213e8b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUI.css @@ -80,5 +80,6 @@ BeanFilterableComboBox { text: "tutti.replaceTemporaryReferential.action.cancel"; toolTipText: "tutti.replaceTemporaryReferential.action.cancel.tip"; i18nMnemonic: "tutti.replaceTemporaryReferential.action.cancel.mnemonic"; + _simpleAction:{fr.ifremer.tutti.ui.swing.content.referential.replace.actions.CloseReplaceUIAction.class}; _help: {"tutti.replaceTemporaryReferential.action.cancel.help"}; } \ No newline at end of file diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUI.jaxx index 18e8810..63313dd 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUI.jaxx @@ -87,7 +87,7 @@ <row anchor='south'> <cell columns='2' fill="both"> <JPanel layout='{new GridLayout(1, 0)}'> - <JButton id='cancelButton' onActionPerformed='model.setValid(false); dispose();'/> + <JButton id='cancelButton'/> <JButton id='replaceButton'/> </JPanel> </cell> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/CloseReplaceUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/CloseReplaceUIAction.java new file mode 100644 index 0000000..ff9e20d --- /dev/null +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/CloseReplaceUIAction.java @@ -0,0 +1,27 @@ +package fr.ifremer.tutti.ui.swing.content.referential.replace.actions; + +import fr.ifremer.tutti.ui.swing.content.referential.replace.AbstractReplaceTemporaryUI; +import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; + +/** + * Created on 3/11/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 3.15 + */ +public class CloseReplaceUIAction extends SimpleActionSupport<AbstractReplaceTemporaryUI>{ + + private static final long serialVersionUID = 1L; + + public CloseReplaceUIAction(AbstractReplaceTemporaryUI ui) { + super(ui); + } + + @Override + protected void onActionPerformed(AbstractReplaceTemporaryUI ui) { + + ui.getModel().setValid(false); + ui.dispose(); + + } +} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.