diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/ComboDialogField.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/ComboDialogField.java
index 748e537b19a..a835231b834 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/ComboDialogField.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/ComboDialogField.java
@@ -59,7 +59,7 @@ public class ComboDialogField extends DialogField {
 	
 	protected static GridData gridDataForCombo(int span) {
 		GridData gd= new GridData();
-		gd.horizontalAlignment= gd.FILL;
+		gd.horizontalAlignment= GridData.FILL;
 		gd.grabExcessHorizontalSpace= false;
 		gd.horizontalSpan= span;
 		return gd;
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/DialogField.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/DialogField.java
index c35be45645f..96c86b7981e 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/DialogField.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/DialogField.java
@@ -162,7 +162,7 @@ public class DialogField {
 	public static Control createEmptySpace(Composite parent, int span) {
 		Label label= new Label(parent, SWT.LEFT);
 		GridData gd= new GridData();
-		gd.horizontalAlignment= gd.BEGINNING;
+		gd.horizontalAlignment= GridData.BEGINNING;
 		gd.grabExcessHorizontalSpace= false;
 		gd.horizontalSpan= span;
 		gd.horizontalIndent= 0;
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/ListDialogField.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/ListDialogField.java
index c3bc5b39cb0..d403aa76551 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/ListDialogField.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/ListDialogField.java
@@ -178,14 +178,14 @@ public class ListDialogField extends DialogField {
 		
 		Label label= getLabelControl(parent);
 		GridData gd= gridDataForLabel(1);
-		gd.verticalAlignment= gd.BEGINNING;
+		gd.verticalAlignment= GridData.BEGINNING;
 		label.setLayoutData(gd);
 		
 		Control list= getListControl(parent);
 		gd= new GridData();
-		gd.horizontalAlignment= gd.FILL;
+		gd.horizontalAlignment= GridData.FILL;
 		gd.grabExcessHorizontalSpace= false;
-		gd.verticalAlignment= gd.FILL;
+		gd.verticalAlignment= GridData.FILL;
 		gd.grabExcessVerticalSpace= true;
 		gd.horizontalSpan= nColumns - 2;
 		gd.widthHint= converter.convertWidthInCharsToPixels(50);
@@ -195,9 +195,9 @@ public class ListDialogField extends DialogField {
 		
 		Composite buttons= getButtonBox(parent);
 		gd= new GridData();
-		gd.horizontalAlignment= gd.FILL;
+		gd.horizontalAlignment= GridData.FILL;
 		gd.grabExcessHorizontalSpace= false;
-		gd.verticalAlignment= gd.FILL;
+		gd.verticalAlignment= GridData.FILL;
 		gd.grabExcessVerticalSpace= true;
 		gd.horizontalSpan= 1;
 		buttons.setLayoutData(gd);
@@ -278,9 +278,9 @@ public class ListDialogField extends DialogField {
 		button.setText(label);
 		button.addSelectionListener(listener);
 		GridData gd= new GridData();
-		gd.horizontalAlignment= gd.FILL;
+		gd.horizontalAlignment= GridData.FILL;
 		gd.grabExcessHorizontalSpace= true;
-		gd.verticalAlignment= gd.BEGINNING;
+		gd.verticalAlignment= GridData.BEGINNING;
 		gd.heightHint = SWTUtil.getButtonHeigthHint(button);
 		gd.widthHint = SWTUtil.getButtonWidthHint(button);
 	
@@ -292,8 +292,8 @@ public class ListDialogField extends DialogField {
 		Label separator= new Label(parent, SWT.NONE);
 		separator.setVisible(false);
 		GridData gd= new GridData();
-		gd.horizontalAlignment= gd.FILL;
-		gd.verticalAlignment= gd.BEGINNING;
+		gd.horizontalAlignment= GridData.FILL;
+		gd.verticalAlignment= GridData.BEGINNING;
 		gd.heightHint= 4;
 		separator.setLayoutData(gd);
 		return separator;
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/SelectionButtonDialogField.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/SelectionButtonDialogField.java
index 000243df1fb..81d73f06849 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/SelectionButtonDialogField.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/SelectionButtonDialogField.java
@@ -78,7 +78,7 @@ public class SelectionButtonDialogField extends DialogField {
 		Button button= getSelectionButton(parent);
 		GridData gd= new GridData();
 		gd.horizontalSpan= nColumns;
-		gd.horizontalAlignment= gd.FILL;
+		gd.horizontalAlignment= GridData.FILL;
 		if (fButtonStyle == SWT.PUSH) {
 			gd.heightHint = SWTUtil.getButtonHeigthHint(button);
 			gd.widthHint = SWTUtil.getButtonWidthHint(button);
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/Separator.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/Separator.java
index f1819e61dfd..7414b5193b4 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/Separator.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/Separator.java
@@ -63,8 +63,8 @@ public class Separator extends DialogField {
 	
 	protected static GridData gridDataForSeperator(int span, int height) {
 		GridData gd= new GridData();
-		gd.horizontalAlignment= gd.FILL;
-		gd.verticalAlignment= gd.BEGINNING;
+		gd.horizontalAlignment= GridData.FILL;
+		gd.verticalAlignment= GridData.BEGINNING;
 		gd.heightHint= height;		
 		gd.horizontalSpan= span;
 		return gd;
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/StringButtonDialogField.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/StringButtonDialogField.java
index 07230cf81e0..f73e64a3db9 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/StringButtonDialogField.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/StringButtonDialogField.java
@@ -76,7 +76,7 @@ public class StringButtonDialogField extends StringDialogField {
 	
 	protected static GridData gridDataForButton(Button button, int span) {
 		GridData gd= new GridData();
-		gd.horizontalAlignment= gd.FILL;
+		gd.horizontalAlignment= GridData.FILL;
 		gd.grabExcessHorizontalSpace= false;
 		gd.horizontalSpan= span;
 		gd.heightHint = SWTUtil.getButtonHeigthHint(button);
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/StringButtonStatusDialogField.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/StringButtonStatusDialogField.java
index 3e4e5ab2fdd..5cca3cd2572 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/StringButtonStatusDialogField.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/StringButtonStatusDialogField.java
@@ -108,7 +108,7 @@ public class StringButtonStatusDialogField extends StringButtonDialogField {
 	
 	protected GridData gridDataForStatusLabel(Control aControl, int span) {
 		GridData gd= new GridData();
-		gd.horizontalAlignment= gd.BEGINNING;
+		gd.horizontalAlignment= GridData.BEGINNING;
 		gd.grabExcessHorizontalSpace= false;
 		gd.horizontalIndent= 0;
 		if (fWidthHintString != null) {
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/StringDialogField.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/StringDialogField.java
index 767dd2cf134..cffafddc3a9 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/StringDialogField.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/StringDialogField.java
@@ -52,7 +52,7 @@ public class StringDialogField extends DialogField {
 	
 	protected static GridData gridDataForText(int span) {
 		GridData gd= new GridData();
-		gd.horizontalAlignment= gd.FILL;
+		gd.horizontalAlignment= GridData.FILL;
 		gd.grabExcessHorizontalSpace= false;
 		gd.horizontalSpan= span;
 		return gd;