--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/OtherSettingsDialog.java	Tue Oct 19 14:41:12 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/OtherSettingsDialog.java	Wed Oct 20 09:35:54 2010 -0500
@@ -34,7 +34,7 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.dialogs.PreferencesUtil;
 
-import com.nokia.cdt.internal.debug.launch.newwizard.LaunchWizardData.EBuildBeforeLaunchOption;
+import com.nokia.cdt.internal.debug.launch.newwizard.IOtherSettingsWizardData.EBuildBeforeLaunchOption;
 
 /**
  *	This dialog allows in-depth configuration of the other settings in the launch.
@@ -46,9 +46,11 @@
 	private Button fEnableBuildButton;
 	private Button fWorkspaceSettingsButton;
 	private Link fWorkspaceSettingsLink;
+	private IOtherSettingsWizardData otherSettingsWizardData;
 
-	protected OtherSettingsDialog(Shell shell, LaunchWizardData data) {
+	protected OtherSettingsDialog(Shell shell, IWizardData data) {
 		super(shell, data);
+		otherSettingsWizardData = (IOtherSettingsWizardData) data;
 	}
 
 	
@@ -93,7 +95,7 @@
 		fDisableBuildButton.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				data.setBuildBeforeLaunchOption(EBuildBeforeLaunchOption.NEVER);
+				otherSettingsWizardData.setBuildBeforeLaunchOption(EBuildBeforeLaunchOption.NEVER);
 			}
 		});
 		
@@ -108,7 +110,7 @@
 		fEnableBuildButton.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				data.setBuildBeforeLaunchOption(EBuildBeforeLaunchOption.ALWAYS);
+				otherSettingsWizardData.setBuildBeforeLaunchOption(EBuildBeforeLaunchOption.ALWAYS);
 			}
 		});
 		
@@ -123,7 +125,7 @@
 		fWorkspaceSettingsButton.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				data.setBuildBeforeLaunchOption(EBuildBeforeLaunchOption.USE_WORKSPACE_SETTING);
+				otherSettingsWizardData.setBuildBeforeLaunchOption(EBuildBeforeLaunchOption.USE_WORKSPACE_SETTING);
 			}
 		});
 		
@@ -145,7 +147,7 @@
 			}
 		});
 		
-		switch (data.getBuildBeforeLaunch()) {
+		switch (otherSettingsWizardData.getBuildBeforeLaunch()) {
 		case ALWAYS:
 			fEnableBuildButton.setSelection(true);
 			fEnableBuildButton.setFocus();
@@ -171,7 +173,7 @@
 		updateStatus(status);
 		
 		String wsState = ""; //$NON-NLS-1$
-		if (data.isWorkspaceBuildBeforeLaunch())
+		if (otherSettingsWizardData.isWorkspaceBuildBeforeLaunch())
 			wsState = Messages.getString("OtherSettingsDialog.EnabledLabel"); //$NON-NLS-1$
 		else
 			wsState = Messages.getString("OtherSettingsDialog.DisabledLabel"); //$NON-NLS-1$