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 1a89ad780d5838761858bf958a3220987847a260 Author: jcouteau <couteau@codelutin.com> Date: Tue Oct 30 16:01:07 2018 +0100 Fix CastException --- .../ui/swing/content/demande/DemandeUIHandler.java | 46 +++++++++++----------- 1 file changed, 24 insertions(+), 22 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 8204397d..ec9020fb 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 @@ -283,30 +283,32 @@ public class DemandeUIHandler extends AbstractFaxToMailUIHandler<DemandeUIModel, } public void resize(){ - JScrollPane holder = (JScrollPane) mailBodyPanel.getComponent(0); - JTextPane pane = (JTextPane) ((JViewport) holder.getComponent(0)).getComponent(0); - - //compute box height so that it can be taken into account later on - int boxHeight = 0; - for (Component component:mailBodyPanel.getComponents()){ - if (!(component instanceof JScrollPane)){ - boxHeight += component.getHeight(); + if (mailBodyPanel.getComponent(0) instanceof JScrollPane) { + JScrollPane holder = (JScrollPane) mailBodyPanel.getComponent(0); + JTextPane pane = (JTextPane) ((JViewport) holder.getComponent(0)).getComponent(0); + + //compute box height so that it can be taken into account later on + int boxHeight = 0; + for (Component component : mailBodyPanel.getComponents()) { + if (!(component instanceof JScrollPane)) { + boxHeight += component.getHeight(); + } } - } - - holder.setPreferredSize(new Dimension(mailBodyPanel.getWidth(), pane.getHeight())); - holder.setMinimumSize(new Dimension(mailBodyPanel.getWidth(), pane.getHeight())); - - //Resize mailBodyPanel so that it takes pane height + box height - if (boxHeight < 0) { - mailBodyPanel.setPreferredSize(new Dimension(mailBodyScrollPane.getWidth() - 30, pane.getHeight() - boxHeight)); - mailBodyPanel.setMaximumSize(new Dimension(mailBodyScrollPane.getWidth() - 30, Integer.MAX_VALUE)); - } else { - mailBodyPanel.setPreferredSize(new Dimension(mailBodyScrollPane.getWidth() - 30, pane.getHeight() + boxHeight)); - mailBodyPanel.setMaximumSize(new Dimension(mailBodyScrollPane.getWidth() - 30, Integer.MAX_VALUE)); - } - mailBodyPanel.repaint(); + holder.setPreferredSize(new Dimension(mailBodyPanel.getWidth(), pane.getHeight())); + holder.setMinimumSize(new Dimension(mailBodyPanel.getWidth(), pane.getHeight())); + + //Resize mailBodyPanel so that it takes pane height + box height + if (boxHeight < 0) { + mailBodyPanel.setPreferredSize(new Dimension(mailBodyScrollPane.getWidth() - 30, pane.getHeight() - boxHeight)); + mailBodyPanel.setMaximumSize(new Dimension(mailBodyScrollPane.getWidth() - 30, Integer.MAX_VALUE)); + } else { + mailBodyPanel.setPreferredSize(new Dimension(mailBodyScrollPane.getWidth() - 30, pane.getHeight() + boxHeight)); + mailBodyPanel.setMaximumSize(new Dimension(mailBodyScrollPane.getWidth() - 30, Integer.MAX_VALUE)); + } + + mailBodyPanel.repaint(); + } } }); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.