diff options
| author | Carolyn MacLeod | 2009-05-11 16:44:26 +0000 |
|---|---|---|
| committer | Carolyn MacLeod | 2009-05-11 16:44:26 +0000 |
| commit | b8696a379430dbce1590d533d4929b14cb48080a (patch) | |
| tree | f0ea6672997165f9671b8bd40befd2f4e7307236 /examples/org.eclipse.swt.examples | |
| parent | 4ec7a1525256ce0e6086987081c79c88a44ac265 (diff) | |
| download | eclipse.platform.swt-b8696a379430dbce1590d533d4929b14cb48080a.tar.gz eclipse.platform.swt-b8696a379430dbce1590d533d4929b14cb48080a.tar.xz eclipse.platform.swt-b8696a379430dbce1590d533d4929b14cb48080a.zip | |
275681 - NPE in DialogTab, it doesn't check for null returned by PrintDialog#open
Diffstat (limited to 'examples/org.eclipse.swt.examples')
| -rwxr-xr-x | examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/DialogTab.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/DialogTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/DialogTab.java index 25421c1e35..a8ff9e5426 100755 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/DialogTab.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/DialogTab.java @@ -188,10 +188,13 @@ class DialogTab extends Tab { textWidget.append ("getStartPage() = " + dialog.getStartPage() + Text.DELIMITER); textWidget.append ("getEndPage() = " + dialog.getEndPage() + Text.DELIMITER); textWidget.append ("getPrintToFile() = " + dialog.getPrintToFile() + Text.DELIMITER); - textWidget.append ("result.fileName = " + result.fileName + Text.DELIMITER); - textWidget.append ("result.orientation = " + (result.orientation == PrinterData.LANDSCAPE ? "PrinterData.LANDSCAPE" : "PrinterData.PORTRAIT") + Text.DELIMITER); - textWidget.append ("result.copyCount = " + result.copyCount + Text.DELIMITER); - textWidget.append ("result.collate = " + result.collate + Text.DELIMITER + Text.DELIMITER); + if (result != null) { + textWidget.append ("result.fileName = " + result.fileName + Text.DELIMITER); + textWidget.append ("result.orientation = " + (result.orientation == PrinterData.LANDSCAPE ? "PrinterData.LANDSCAPE" : "PrinterData.PORTRAIT") + Text.DELIMITER); + textWidget.append ("result.copyCount = " + result.copyCount + Text.DELIMITER); + textWidget.append ("result.collate = " + result.collate + Text.DELIMITER); + } + textWidget.append (Text.DELIMITER); return; } |