branch develop updated (dba2541 -> 1d65de5)
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 dba2541 utilisation nouveau service de generation de rapport + fixes #6589: [RAPPORT] inclure les identifiants du trait dans le nom du rapport généré (rapport Birt) new 1d65de5 do not use directly errorHelper from long action + use correct desktop method (open to open file) 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 1d65de577ae52af616d591df7a5e116a54567c2c Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 11 15:59:45 2015 +0100 do not use directly errorHelper from long action + use correct desktop method (open to open file) Summary of changes: .../catches/species/actions/ImportPupitriAction.java | 2 +- .../ui/swing/content/report/actions/OpenReportAction.java | 3 +-- .../java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 14 ++++++++------ .../util/attachment/actions/OpenAttachmentAction.java | 2 +- 4 files changed, 11 insertions(+), 10 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 1d65de577ae52af616d591df7a5e116a54567c2c Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 11 15:59:45 2015 +0100 do not use directly errorHelper from long action + use correct desktop method (open to open file) --- .../catches/species/actions/ImportPupitriAction.java | 2 +- .../ui/swing/content/report/actions/OpenReportAction.java | 3 +-- .../java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 14 ++++++++------ .../util/attachment/actions/OpenAttachmentAction.java | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) 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 f97e535..17b3ea3 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 @@ -237,7 +237,7 @@ public class ImportPupitriAction extends LongActionSupport<SpeciesBatchUIModel, log.info("Open pupitri report at " + attachmentFile); } - TuttiUIUtil.browseFile(attachmentFile); + TuttiUIUtil.openResource(attachmentFile); } } else { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/actions/OpenReportAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/actions/OpenReportAction.java index b5223dc..b62572f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/actions/OpenReportAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/actions/OpenReportAction.java @@ -24,9 +24,8 @@ public class OpenReportAction extends SimpleActionSupport<ReportUI> { protected void onActionPerformed(ReportUI ui) { File outputFile = ui.getModel().getOutputFile(); - TuttiUIUtil.browseFile(outputFile); + TuttiUIUtil.openResource(outputFile); } - } \ No newline at end of file diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java index 2fcd826..bfbbf6e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java @@ -47,7 +47,6 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.io.File; -import java.io.IOException; import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; @@ -147,14 +146,17 @@ public final class TuttiUIUtil extends ApplicationUIUtil { return SwingUtil.createActionIcon(iconName); } - public static void browseFile(File file) { + public static void openResource(File file) { + + Desktop desktop = getDesktopForOpen(); - Desktop desktop = getDesktopForBrowse(); try { - desktop.browse(file.toURI()); - } catch (IOException e) { - TuttiUIContext.getApplicationContext().getErrorHelper().showErrorDialog(t("swing.error.cannot.open.file")); + desktop.open(file); + } catch (Exception e) { + + throw new ApplicationBusinessException(t("swing.error.cannot.open.file")); + } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/actions/OpenAttachmentAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/actions/OpenAttachmentAction.java index 70edfec..4ddfe57 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/actions/OpenAttachmentAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/actions/OpenAttachmentAction.java @@ -43,7 +43,7 @@ public class OpenAttachmentAction extends SimpleActionSupport<AttachmentItem> { if (log.isInfoEnabled()) { log.info("Open attachment: " + file); } - TuttiUIUtil.browseFile(file); + TuttiUIUtil.openResource(file); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm