From 5cfae571a109b24d6837d75b3c63dd39058a055f Mon Sep 17 00:00:00 2001 From: David Inglis Date: Wed, 31 Mar 2004 02:40:20 +0000 Subject: [PATCH] fixed NPE when message field is disabled --- .../src/org/eclipse/cdt/ui/dialogs/TabFolderOptionBlock.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/TabFolderOptionBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/TabFolderOptionBlock.java index 7d7fc4c2a2b..0b6652cd88c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/TabFolderOptionBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/TabFolderOptionBlock.java @@ -95,7 +95,7 @@ public abstract class TabFolderOptionBlock { setCurrentPage((ICOptionPage) pages.get(0)); initializingTabs = false; String desc = ((ICOptionPage) pages.get(0)).getDescription(); - if (desc != null) { + if (messageLabel != null && desc != null) { messageLabel.setText(desc); } return composite; @@ -186,7 +186,7 @@ public abstract class TabFolderOptionBlock { if (ok) { setErrorMessage(null); ICOptionPage tab = getCurrentPage(); - if (bShowMessageArea) { + if (messageLabel != null) { messageLabel.setText(tab.getDescription() != null ? tab.getDescription() : ""); //$NON-NLS-1$ } }