diff --git a/core/org.eclipse.cdt.ui.tests/ChangeLog b/core/org.eclipse.cdt.ui.tests/ChangeLog
index 7a7df869070..5960dae7537 100644
--- a/core/org.eclipse.cdt.ui.tests/ChangeLog
+++ b/core/org.eclipse.cdt.ui.tests/ChangeLog
@@ -1,3 +1,11 @@
+2003-01-29 Peter Graves
+
+    Fixed the warnings when accessing static methods
+    * src/org/eclipse/cdt/testplugin/util/DialogCheck.java:
+    * src/org/eclipse/cdt/testplugin/CTestPlugin.java
+    * src/org/eclipse/cdt/testplugin/TestWorkbench.java
+    * ChangeLog: make all entries have the same formatting
+
 2002-12-17 Peter Graves
 
     * plugin.xml,test.xml: Some simple cleanups to remove refrences to the jdt and
@@ -16,6 +24,7 @@
 	CProjectNature and CCProjectNature, fix the test.
 
 2002-10-18 Peter Graves
+
 	src/org/eclipse/cdt/testplugin/CProjectHelper.jada
     Cleanup of the CProjectHelper file to remove unused imports, commeted out code etc.
     
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/testplugin/CTestPlugin.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/testplugin/CTestPlugin.java
index 3fb21c036fb..98b399254c8 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/testplugin/CTestPlugin.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/testplugin/CTestPlugin.java
@@ -37,7 +37,7 @@ public class CTestPlugin extends Plugin {
 	
 	public static void enableAutobuild(boolean enable) throws CoreException {
 		// disable auto build
-		IWorkspace workspace= fgDefault.getWorkspace();
+		IWorkspace workspace= CTestPlugin.getWorkspace();
 		IWorkspaceDescription desc= workspace.getDescription();
 		desc.setAutoBuilding(enable);
 		workspace.setDescription(desc);
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/testplugin/TestWorkbench.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/testplugin/TestWorkbench.java
index 45bc1e8de3f..0222d528e3d 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/testplugin/TestWorkbench.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/testplugin/TestWorkbench.java
@@ -33,7 +33,7 @@ public class TestWorkbench extends Workbench {
 				break;
 			}
 		}
-		IPath location= CTestPlugin.getDefault().getWorkspace().getRoot().getLocation();
+		IPath location= CTestPlugin.getWorkspace().getRoot().getLocation();
 		System.out.println("Workspace-location: " + location.toString());
 				
 		
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/testplugin/util/DialogCheck.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/testplugin/util/DialogCheck.java
index 8ef16ebce24..a365df68d8f 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/testplugin/util/DialogCheck.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/testplugin/util/DialogCheck.java
@@ -55,13 +55,13 @@ public class DialogCheck {
 	 * executed on this object.
 	 */
 	public static void assertDialog(Dialog dialog, Assert assert) {
-		assert.assertNotNull(dialog);
+		Assert.assertNotNull(dialog);
 		if (_verifyDialog.getShell() == null) {
 			//force the creation of the verify dialog
 			getShell();
 		}
 		if (_verifyDialog.open(dialog) == IDialogConstants.NO_ID) {
-			assert.assertTrue(_verifyDialog.getFailureText(), false);
+			Assert.assertTrue(_verifyDialog.getFailureText(), false);
 		}
 	}
 
@@ -76,7 +76,7 @@ public class DialogCheck {
 	 * executed on this object.
 	 */
 	public static void assertDialogTexts(Dialog dialog, Assert assert) {
-		assert.assertNotNull(dialog);
+		Assert.assertNotNull(dialog);
 		dialog.setBlockOnOpen(false);
 		dialog.open();
 		Shell shell = dialog.getShell();
@@ -167,7 +167,7 @@ public class DialogCheck {
 		if (preferred.x > size.x) {
 			//close the dialog
 			button.getShell().dispose();
-			assert.assertTrue(message.toString(), false);
+			Assert.assertTrue(message.toString(), false);
 		}
 	}
 	
@@ -202,7 +202,7 @@ public class DialogCheck {
 		if (preferred.x > size.x) {
 			//close the dialog
 			label.getShell().dispose();
-			assert.assertTrue(message.toString(), false);
+			Assert.assertTrue(message.toString(), false);
 		}
 	}
 	
diff --git a/debug/org.eclipse.cdt.debug.ui.tests/Changelog b/debug/org.eclipse.cdt.debug.ui.tests/Changelog
index dfd466db591..4a1ecc368d7 100644
--- a/debug/org.eclipse.cdt.debug.ui.tests/Changelog
+++ b/debug/org.eclipse.cdt.debug.ui.tests/Changelog
@@ -1,9 +1,19 @@
+2003-01-29 Peter Graves
+ 
+   Fixed warnings when accessing static methods
+   * src/org/eclipse/cdt/debug/testplugin/util/DialogCheck.java:
+   * src/org/eclipse/cdt/debug/testplugin/CTestPlugin.java:
+   * src/org/eclipse/cdt/debug/testplugin/TestWorkbench.java:
+   * ChangeLog: Make all the entries have the same formatting
+
 2003-01-22 Judy N. Green
+
    * /home/tools/org.eclipse.cdt.debug.ui.tests/.project
    * /home/tools/org.eclipse.cdt.debug.ui.tests/.classpath
    updated classpath and .project to reflect classpath changes.
 
 2003-01-21 Peter Graves
+
 	* src/org/eclipse/cdt/debug/testplugin/CDebugHelper.java: Updated to use new parameters to 
 	ICDISession.createCSession
 
diff --git a/debug/org.eclipse.cdt.debug.ui.tests/src/org/eclipse/cdt/debug/testplugin/CTestPlugin.java b/debug/org.eclipse.cdt.debug.ui.tests/src/org/eclipse/cdt/debug/testplugin/CTestPlugin.java
index 3eceaecf6ea..52c1cd5738d 100644
--- a/debug/org.eclipse.cdt.debug.ui.tests/src/org/eclipse/cdt/debug/testplugin/CTestPlugin.java
+++ b/debug/org.eclipse.cdt.debug.ui.tests/src/org/eclipse/cdt/debug/testplugin/CTestPlugin.java
@@ -37,7 +37,7 @@ public class CTestPlugin extends Plugin {
 	
 	public static void enableAutobuild(boolean enable) throws CoreException {
 		// disable auto build
-		IWorkspace workspace= fgDefault.getWorkspace();
+		IWorkspace workspace= CTestPlugin.getWorkspace();
 		IWorkspaceDescription desc= workspace.getDescription();
 		desc.setAutoBuilding(enable);
 		workspace.setDescription(desc);
diff --git a/debug/org.eclipse.cdt.debug.ui.tests/src/org/eclipse/cdt/debug/testplugin/TestWorkbench.java b/debug/org.eclipse.cdt.debug.ui.tests/src/org/eclipse/cdt/debug/testplugin/TestWorkbench.java
index e5da8ce0c43..af10ae308b9 100644
--- a/debug/org.eclipse.cdt.debug.ui.tests/src/org/eclipse/cdt/debug/testplugin/TestWorkbench.java
+++ b/debug/org.eclipse.cdt.debug.ui.tests/src/org/eclipse/cdt/debug/testplugin/TestWorkbench.java
@@ -33,7 +33,7 @@ public class TestWorkbench extends Workbench {
 				break;
 			}
 		}
-		IPath location= CTestPlugin.getDefault().getWorkspace().getRoot().getLocation();
+		IPath location= CTestPlugin.getWorkspace().getRoot().getLocation();
 		System.out.println("Workspace-location: " + location.toString());
 				
 		
diff --git a/debug/org.eclipse.cdt.debug.ui.tests/src/org/eclipse/cdt/debug/testplugin/util/DialogCheck.java b/debug/org.eclipse.cdt.debug.ui.tests/src/org/eclipse/cdt/debug/testplugin/util/DialogCheck.java
index 2fd5792c78e..8075b01033a 100644
--- a/debug/org.eclipse.cdt.debug.ui.tests/src/org/eclipse/cdt/debug/testplugin/util/DialogCheck.java
+++ b/debug/org.eclipse.cdt.debug.ui.tests/src/org/eclipse/cdt/debug/testplugin/util/DialogCheck.java
@@ -55,13 +55,13 @@ public class DialogCheck {
 	 * executed on this object.
 	 */
 	public static void assertDialog(Dialog dialog, Assert assert) {
-		assert.assertNotNull(dialog);
+		Assert.assertNotNull(dialog);
 		if (_verifyDialog.getShell() == null) {
 			//force the creation of the verify dialog
 			getShell();
 		}
 		if (_verifyDialog.open(dialog) == IDialogConstants.NO_ID) {
-			assert.assertTrue(_verifyDialog.getFailureText(), false);
+			Assert.assertTrue(_verifyDialog.getFailureText(), false);
 		}
 	}
 
@@ -76,7 +76,7 @@ public class DialogCheck {
 	 * executed on this object.
 	 */
 	public static void assertDialogTexts(Dialog dialog, Assert assert) {
-		assert.assertNotNull(dialog);
+		Assert.assertNotNull(dialog);
 		dialog.setBlockOnOpen(false);
 		dialog.open();
 		Shell shell = dialog.getShell();
@@ -167,7 +167,7 @@ public class DialogCheck {
 		if (preferred.x > size.x) {
 			//close the dialog
 			button.getShell().dispose();
-			assert.assertTrue(message.toString(), false);
+			Assert.assertTrue(message.toString(), false);
 		}
 	}
 	
@@ -202,7 +202,7 @@ public class DialogCheck {
 		if (preferred.x > size.x) {
 			//close the dialog
 			label.getShell().dispose();
-			assert.assertTrue(message.toString(), false);
+			Assert.assertTrue(message.toString(), false);
 		}
 	}