diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index cf86ca3313a..83b4a4ef686 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,10 @@
+2004-04-15 Chris Wiebe
+
+	Make some helper functions static for ease of use ...
+	and to get rid of some annoying warnings.
+
+	* src/org/eclipse/cdt/ui/CUIPlugin.java
+
 2004-04-15 Mikhail Khodjaiants
 	Removed dependencies to 'org.eclipse.debug.core' and 'org.eclipse.debug.ui'.
 	* plugin.xml
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java
index d95e3f30b56..7d64a07d861 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java
@@ -148,24 +148,25 @@ public class CUIPlugin extends AbstractUIPlugin {
 	public static ResourceBundle getResourceBundle() {
 		return fgResourceBundle;
 	}
-
-	public IWorkbenchWindow getActiveWorkbenchWindow() {
+	
+	public static IWorkbenchWindow getActiveWorkbenchWindow() {
 		return getDefault().getWorkbench().getActiveWorkbenchWindow();
 	}
 
-	/**
-	 * @return
-	 */
 	public static IWorkbenchPage getActivePage() {
-		IWorkbenchWindow window = getDefault().getActiveWorkbenchWindow();
+		IWorkbenchWindow window = getActiveWorkbenchWindow();
 		if (window != null) {
 			return window.getActivePage();
 		}
 		return null;
 	}
 
-	public Shell getActiveWorkbenchShell() {
-		return getActiveWorkbenchWindow().getShell();
+	public static Shell getActiveWorkbenchShell() {
+		 IWorkbenchWindow window= getActiveWorkbenchWindow();
+		 if (window != null) {
+		 	return window.getShell();
+		 }
+		 return null;
 	}
 
 	public static CUIPlugin getDefault() {