branch develop updated (3cbcdc3 -> 6f42ce0)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 3cbcdc3 fixes #6820: [IMPORT GENERIQUE] Import des pièces jointes Merge branch 'feature/6820' into develop new 6f42ce0 fixes #6877: [IMPORT GENERIQUE] Après une erreur (visualisation du rapport d'import), l'application est bloquée The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 6f42ce015b26b380bbc22f86ff41e28bd2bdb434 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Mar 27 18:33:57 2015 +0100 fixes #6877: [IMPORT GENERIQUE] Après une erreur (visualisation du rapport d'import), l'application est bloquée Summary of changes: .../genericformat/GenericFormatImportUI.css | 4 +-- .../OpenGenericFormatImportReportAction.java | 41 ++++++++++------------ .../OpenGenericFormatValidateReportAction.java | 41 ++++++++++------------ 3 files changed, 38 insertions(+), 48 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 6f42ce015b26b380bbc22f86ff41e28bd2bdb434 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Mar 27 18:33:57 2015 +0100 fixes #6877: [IMPORT GENERIQUE] Après une erreur (visualisation du rapport d'import), l'application est bloquée --- .../genericformat/GenericFormatImportUI.css | 4 +-- .../OpenGenericFormatImportReportAction.java | 41 ++++++++++------------ .../OpenGenericFormatValidateReportAction.java | 41 ++++++++++------------ 3 files changed, 38 insertions(+), 48 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUI.css index a213507..9fa315f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUI.css @@ -104,7 +104,7 @@ JTextField { #openValidateReportButton { actionIcon: open-file; toolTipText: "tutti.genericFormatImport.action.openValidateReport.tip"; - _applicationAction: {fr.ifremer.tutti.ui.swing.content.genericformat.actions.OpenGenericFormatValidateReportAction.class}; + _simpleAction: {fr.ifremer.tutti.ui.swing.content.genericformat.actions.OpenGenericFormatValidateReportAction.class}; _help: {"tutti.genericFormatImport.action.openValidateReport.help"}; } @@ -156,7 +156,7 @@ JTextField { #openImportReportButton { actionIcon: open-file; toolTipText: "tutti.genericFormatImport.action.openImportReport.tip"; - _applicationAction: {fr.ifremer.tutti.ui.swing.content.genericformat.actions.OpenGenericFormatImportReportAction.class}; + _simpleAction: {fr.ifremer.tutti.ui.swing.content.genericformat.actions.OpenGenericFormatImportReportAction.class}; _help: {"tutti.genericFormatImport.action.openImportReport.help"}; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/OpenGenericFormatImportReportAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/OpenGenericFormatImportReportAction.java index 2ca431b..1cd5fe1 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/OpenGenericFormatImportReportAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/OpenGenericFormatImportReportAction.java @@ -24,13 +24,14 @@ package fr.ifremer.tutti.ui.swing.content.genericformat.actions; * #L% */ -import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; +import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.content.genericformat.GenericFormatImportUI; -import fr.ifremer.tutti.ui.swing.content.genericformat.GenericFormatImportUIHandler; import fr.ifremer.tutti.ui.swing.content.genericformat.GenericFormatImportUIModel; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; +import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; import java.awt.Desktop; +import java.io.File; import java.io.IOException; import static org.nuiton.i18n.I18n.t; @@ -41,39 +42,33 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.14 */ -public class OpenGenericFormatImportReportAction extends LongActionSupport<GenericFormatImportUIModel, GenericFormatImportUI, GenericFormatImportUIHandler> { +public class OpenGenericFormatImportReportAction extends SimpleActionSupport<GenericFormatImportUI> { - public OpenGenericFormatImportReportAction(GenericFormatImportUIHandler handler) { - super(handler, true); + private static final long serialVersionUID = 1L; + + public OpenGenericFormatImportReportAction(GenericFormatImportUI ui) { + super(ui); } @Override - public boolean prepareAction() throws Exception { - - boolean doAction = super.prepareAction(); - - if (doAction) { - - doAction = getModel().getImportReportFile() != null && getModel().getImportReportFile().exists(); + protected void onActionPerformed(GenericFormatImportUI ui) { - } + GenericFormatImportUIModel model = ui.getModel(); - return doAction; + File importReportFile = model.getImportReportFile(); - } + if (importReportFile != null && importReportFile.exists()) { - @Override - public void doAction() throws Exception { + Desktop desktop = TuttiUIUtil.getDesktopForBrowse(); + try { - Desktop desktop = TuttiUIUtil.getDesktopForBrowse(); - try { + desktop.browse(importReportFile.toURI()); - desktop.browse(getModel().getImportReportFile().toURI()); + } catch (IOException e) { + TuttiUIContext.getApplicationContext().getErrorHelper().showErrorDialog(t("swing.error.cannot.open.file")); + } - } catch (IOException e) { - getContext().getErrorHelper().showErrorDialog(t("swing.error.cannot.open.file")); } - } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/OpenGenericFormatValidateReportAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/OpenGenericFormatValidateReportAction.java index 52c63f2..6f6db1c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/OpenGenericFormatValidateReportAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/OpenGenericFormatValidateReportAction.java @@ -24,13 +24,14 @@ package fr.ifremer.tutti.ui.swing.content.genericformat.actions; * #L% */ -import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; +import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.content.genericformat.GenericFormatImportUI; -import fr.ifremer.tutti.ui.swing.content.genericformat.GenericFormatImportUIHandler; import fr.ifremer.tutti.ui.swing.content.genericformat.GenericFormatImportUIModel; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; +import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; import java.awt.Desktop; +import java.io.File; import java.io.IOException; import static org.nuiton.i18n.I18n.t; @@ -41,39 +42,33 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.14 */ -public class OpenGenericFormatValidateReportAction extends LongActionSupport<GenericFormatImportUIModel, GenericFormatImportUI, GenericFormatImportUIHandler> { +public class OpenGenericFormatValidateReportAction extends SimpleActionSupport<GenericFormatImportUI> { - public OpenGenericFormatValidateReportAction(GenericFormatImportUIHandler handler) { - super(handler, true); + private static final long serialVersionUID = 1L; + + public OpenGenericFormatValidateReportAction(GenericFormatImportUI ui) { + super(ui); } @Override - public boolean prepareAction() throws Exception { - - boolean doAction = super.prepareAction(); - - if (doAction) { - - doAction = getModel().getValidateReportFile() != null && getModel().getValidateReportFile().exists(); + protected void onActionPerformed(GenericFormatImportUI ui) { - } + GenericFormatImportUIModel model = ui.getModel(); - return doAction; + File validateReportFile = model.getValidateReportFile(); - } + if (validateReportFile != null && validateReportFile.exists()) { - @Override - public void doAction() throws Exception { + Desktop desktop = TuttiUIUtil.getDesktopForBrowse(); + try { - Desktop desktop = TuttiUIUtil.getDesktopForBrowse(); - try { + desktop.browse(validateReportFile.toURI()); - desktop.browse(getModel().getValidateReportFile().toURI()); + } catch (IOException e) { + TuttiUIContext.getApplicationContext().getErrorHelper().showErrorDialog(t("swing.error.cannot.open.file")); + } - } catch (IOException e) { - getContext().getErrorHelper().showErrorDialog(t("swing.error.cannot.open.file")); } - } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm