Author: kmorin Date: 2014-09-18 15:43:09 +0200 (Thu, 18 Sep 2014) New Revision: 628 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/628 Log: - fix potential npe - set the topest ui for the quit dialog to have the pdf editor has parent Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java 2014-09-18 13:34:55 UTC (rev 627) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java 2014-09-18 13:43:09 UTC (rev 628) @@ -268,8 +268,13 @@ ); return result; } - + @Override + public Component getTopestUI() { + return getUI(); + } + + @Override public void onCloseUI() { } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java 2014-09-18 13:34:55 UTC (rev 627) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java 2014-09-18 13:43:09 UTC (rev 628) @@ -395,13 +395,15 @@ } protected void closeFrame(JFrame frame, AbstractApplicationUIHandler handler) { - boolean canClose = true; - if (handler instanceof CloseableUI) { - canClose = ((CloseableUI) handler).quitUI(); + if (frame != null) { + boolean canClose = true; + if (handler instanceof CloseableUI) { + canClose = ((CloseableUI) handler).quitUI(); + } + if (canClose) { + frame.dispose(); + } } - if (canClose) { - frame.dispose(); - } } protected <HL extends HasLabel> void initCheckBoxComboBox(final JComboBox<HL> comboBox,