This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 75ad610714aef5ce0ba025e958d706fc8e0845df Author: Kevin Morin <morin@codelutin.com> Date: Mon Mar 13 11:06:59 2017 +0100 fixes #9102 Accélérer le scroll --- .../ui/swing/content/demande/DemandeUIHandler.java | 9 +-------- .../faxtomail/ui/swing/content/pdfeditor/PDFEditorUI.jaxx | 2 +- .../ui/swing/content/pdfeditor/PDFEditorUIHandler.java | 10 +++------- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 13 +++++++++++++ 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java index d4ba388..4f21964 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java @@ -215,14 +215,7 @@ public class DemandeUIHandler extends AbstractFaxToMailUIHandler<DemandeUIModel, JPanel editorPanel = ui.getMailBodyPanel(); FaxToMailUIUtil.setEmailContentInTextPane(this, model, editorPanel); - SwingUtilities.invokeLater(new Runnable() { - public void run() { - JScrollPane mailBodyScrollPane = getUI().getMailBodyScrollPane(); - mailBodyScrollPane.getVerticalScrollBar().setValue(0); - mailBodyScrollPane.getVerticalScrollBar().setUnitIncrement(16); - mailBodyScrollPane.getHorizontalScrollBar().setValue(0); - } - }); + FaxToMailUIUtil.initScrollPaneBars(getUI().getMailBodyScrollPane()); // init table final JXTable table = ui.getRangeTable(); diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUI.jaxx b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUI.jaxx index 156d8d6..d9a4312 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUI.jaxx +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUI.jaxx @@ -88,7 +88,7 @@ </JToolBar> - <JScrollPane constraints='BorderLayout.CENTER'> + <JScrollPane id="documentScrollPane" constraints='BorderLayout.CENTER'> <JPanel> <JPanel id="container" layout="{null}"> <JImagePanel id="documentPanel" onMouseClicked="handler.addEditionComponent(event)"> diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java index c41f0c9..177307d 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java @@ -163,6 +163,8 @@ public class PDFEditorUIHandler extends AbstractFaxToMailUIHandler<PDFEditorUIMo } }); + FaxToMailUIUtil.initScrollPaneBars(getUI().getDocumentScrollPane()); + model.addPropertyChangeListener(PDFEditorUIModel.PROPERTY_CURRENT_PAGE_INDEX, new PropertyChangeListener() { @Override @@ -189,13 +191,7 @@ public class PDFEditorUIHandler extends AbstractFaxToMailUIHandler<PDFEditorUIMo try { file = convertFileToPdf(attachmentFile); - } catch (IOException e) { - if (log.isErrorEnabled()) { - log.error("error while converting file to pdf", e); - } - getContext().getErrorHelper().showErrorDialog(t("faxtomail.pdfEditor.convertToPdf.error")); - - } catch (DocumentException e) { + } catch (IOException | DocumentException e) { if (log.isErrorEnabled()) { log.error("error while converting file to pdf", e); } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java index 55db3da..978295c 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java @@ -76,8 +76,10 @@ import javax.swing.Box; import javax.swing.Icon; import javax.swing.JEditorPane; import javax.swing.JPanel; +import javax.swing.JScrollPane; import javax.swing.JTextPane; import javax.swing.JTree; +import javax.swing.SwingUtilities; import javax.swing.event.HyperlinkEvent; import javax.swing.event.HyperlinkListener; import javax.swing.tree.DefaultMutableTreeNode; @@ -918,4 +920,15 @@ public final class FaxToMailUIUtil extends ApplicationUIUtil { originalEmail); } + public static void initScrollPaneBars(final JScrollPane scrollPane) { + SwingUtilities.invokeLater(new Runnable() { + public void run() { + scrollPane.getVerticalScrollBar().setValue(0); + scrollPane.getVerticalScrollBar().setUnitIncrement(16); + scrollPane.getHorizontalScrollBar().setValue(0); + scrollPane.getHorizontalScrollBar().setUnitIncrement(16); + } + }); + } + } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.