From 4c9d0ef2a3fbc52750f8ae7d34fbcda2461185b8 Mon Sep 17 00:00:00 2001
From: David Inglis <dinglis@qnx.com>
Date: Thu, 4 Mar 2004 20:17:22 +0000
Subject: [PATCH] some changes to better extend

---
 .../cdt/ui/dialogs/TabFolderOptionBlock.java  | 36 +++++++++++++++----
 1 file changed, 29 insertions(+), 7 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 769c63e31d8..cbcf7984509 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
@@ -6,9 +6,8 @@ package org.eclipse.cdt.ui.dialogs;
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v05.html
  * 
- * Contributors:
- * QNX Software Systems - Initial API and implementation
-***********************************************************************/
+ * Contributors: QNX Software Systems - Initial API and implementation
+ ******************************************************************************/
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -46,11 +45,22 @@ public abstract class TabFolderOptionBlock {
 
 	private TabFolder fFolder;
 
-	public TabFolderOptionBlock(ICOptionContainer parent, boolean showMessageArea) {
-		fParent = parent;
+	public TabFolderOptionBlock(boolean showMessageArea) {
 		bShowMessageArea = showMessageArea;
 	}
 
+	public TabFolderOptionBlock(ICOptionContainer parent, boolean showMessageArea) {
+		bShowMessageArea = showMessageArea;
+		setOptionContainer(parent);
+	}
+
+	/**
+	 * @param parent
+	 */
+	public void setOptionContainer(ICOptionContainer parent) {
+		fParent = parent;
+	}
+
 	public TabFolderOptionBlock(ICOptionContainer parent) {
 		this(parent, true);
 	}
@@ -94,6 +104,17 @@ public abstract class TabFolderOptionBlock {
 		return composite;
 	}
 
+	/**
+	 * @return
+	 */
+	protected ICOptionPage getStartPage() {
+		return (ICOptionPage) pages.get(0);
+	}
+
+	public int getPageIndex() {
+		return pages.indexOf(getCurrentPage());
+	}
+
 	protected void createFolder(Composite parent) {
 		fFolder = new TabFolder(parent, SWT.NONE);
 		fFolder.setLayoutData(new GridData(GridData.FILL_BOTH));
@@ -168,8 +189,9 @@ public abstract class TabFolderOptionBlock {
 		if (ok) {
 			setErrorMessage(null);
 			ICOptionPage tab = getCurrentPage();
-			if (bShowMessageArea && tab.getDescription() != null)
-				messageLabel.setText(tab.getDescription());
+			if (bShowMessageArea) {
+		        messageLabel.setText(tab.getDescription() != null ? tab.getDescription() : ""); //$NON-NLS-1$
+			}
 		}
 		setValid(ok);
 	}