Bug 312848: Remove CDI-GDB pref to enable distinct code and data spaces

2 files changed, 1 insertions, 8 deletions

diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/preferences/MIPreferencePage.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/preferences/MIPreferencePage.java
index b6b6a82a566..91f24683dfa 100644
--- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/preferences/MIPreferencePage.java
+++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/preferences/MIPreferencePage.java
@@ -327,8 +327,6 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer
 
 	private BooleanFieldEditor fRefreshSolibsButton;
 	
-	private BooleanFieldEditor fMemorySpacesButton;
-
 	private MIPreferenceStore fMICorePreferenceStore = new MIPreferenceStore( MIPlugin.getDefault().getPluginPreferences() );
 
 	/**
@@ -360,8 +358,6 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer
 		composite.setLayoutData( data );
 		createSpacer( composite, 1 );
 		createCommunicationPreferences( composite );
-		createSpacer( composite, 1 );
-		fMemorySpacesButton = createCheckbox(IMIConstants.PREF_ENABLE_MEMORY_SPACES, PreferenceMessages.getString( "MIPreferencePage.7" ), composite ); //$NON-NLS-1$
 		return composite;
 	}
 
@@ -402,7 +398,6 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer
 		fDebugTimeoutText.loadDefault();
 		fLaunchTimeoutText.loadDefault();
 		fRefreshSolibsButton.loadDefault();
-		fMemorySpacesButton.loadDefault();
 	}
 
 	/*
@@ -444,7 +439,6 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer
 		fDebugTimeoutText.store();
 		fLaunchTimeoutText.store();
 		fRefreshSolibsButton.store();
-		fMemorySpacesButton.store();
 	}
 
 	private MIIntegerFieldEditor createTimeoutField( String preference, String label, Composite parent ) {
@@ -482,7 +476,6 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer
 		fDebugTimeoutText.dispose();
 		fLaunchTimeoutText.dispose();
 		fRefreshSolibsButton.dispose();
-		fMemorySpacesButton.dispose();
 		super.dispose();
 	}
 
diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/preferences/PreferenceMessages.properties b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/preferences/PreferenceMessages.properties
index 263ab4d016a..798b955e32f 100644
--- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/preferences/PreferenceMessages.properties
+++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/preferences/PreferenceMessages.properties
@@ -16,4 +16,4 @@ MIPreferencePage.2=&Debugger timeout (ms):
 MIPreferencePage.3=&Launch timeout (ms):
 MIPreferencePage.4=Value must be an integer between {0} and {1}.
 MIPreferencePage.6=Automatically refresh modules
-MIPreferencePage.7=Support distinct code and data memory spaces
+