This is an automated email from the git hooks/post-receive script. New commit to branch support/3.13.x in repository tutti. See http://git.codelutin.com/tutti.git commit ea1f275bedaa34ad69eef4be2f7f20f937e18f39 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) --- .../tutti/ui/swing/action/ImportPupitriAction.java | 2 +- .../content/report/actions/OpenReportAction.java | 3 +-- .../fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 20 ++++++++++++-------- .../util/attachment/AttachmentEditorUIHandler.java | 2 +- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPupitriAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPupitriAction.java index b9242c7..7ec47e2 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPupitriAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPupitriAction.java @@ -235,7 +235,7 @@ public class ImportPupitriAction extends AbstractTuttiAction<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 b3f8ff8..4192e13 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 AbstractTuttiAction<ReportUIModel, ReportU public void doAction() throws Exception { File outputFile = 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 e94ce78..9004d8b 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 @@ -34,13 +34,14 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.application.ApplicationBusinessException; import org.nuiton.jaxx.application.swing.util.ApplicationUIUtil; -import javax.swing.*; -import java.awt.*; +import javax.swing.ImageIcon; +import javax.swing.JComponent; +import java.awt.Color; +import java.awt.Desktop; 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; @@ -140,14 +141,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/AttachmentEditorUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java index dd326ec..3733319 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java @@ -237,7 +237,7 @@ public class AttachmentEditorUIHandler extends AbstractTuttiUIHandler<TuttiUICon throw new ApplicationTechnicalException(t("tutti.attachmentEditor.fileNotFound", file.getAbsolutePath())); } - TuttiUIUtil.browseFile(file); + TuttiUIUtil.openResource(file); } public void saveAttachment(Attachment attachment) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.