From e76316f9bc0f79f2c71fb1709757b3363ca1f484 Mon Sep 17 00:00:00 2001
From: Mikhail Khodjaiants <mikhailkhod@googlemail.com>
Date: Thu, 9 Jun 2005 21:31:06 +0000
Subject: [PATCH] Warning cleanup.

---
 debug/org.eclipse.cdt.debug.ui/ChangeLog      |  4 ++++
 .../debug/internal/ui/CBreakpointUpdater.java |  3 +--
 .../internal/ui/CDebugModelPresentation.java  | 20 ++-----------------
 3 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog
index 8a27dd3c1eb..100147e3a5f 100644
--- a/debug/org.eclipse.cdt.debug.ui/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog
@@ -2,6 +2,10 @@
 	Warning cleanup.
 	* CDebugModelPresentation.java
 
+2005-06-09 Mikhail Khodjaiants
+	Warning cleanup.
+	* CBreakpointUpdater.java
+
 2005-06-09 Mikhail Khodjaiants
 	Bug 94139: User-defined register groups.
 	Externalized strings for the "Restore Default Register Groups" action.
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CBreakpointUpdater.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CBreakpointUpdater.java
index 03f87444ec9..d80c58076a3 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CBreakpointUpdater.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CBreakpointUpdater.java
@@ -19,7 +19,6 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.model.IBreakpoint;
 import org.eclipse.debug.core.model.IDebugTarget;
-import org.eclipse.debug.internal.ui.DebugUIPlugin;
 import org.eclipse.swt.widgets.Display;
 
 /**
@@ -122,7 +121,7 @@ public class CBreakpointUpdater implements ICBreakpointListener {
 	}
 
 	private void asyncExec( Runnable r ) {
-		Display display = DebugUIPlugin.getStandardDisplay();
+		Display display = Display.getDefault();
 		if ( display != null )
 			display.asyncExec( r );
 	}
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugModelPresentation.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugModelPresentation.java
index 8c51114655e..22cf7d25290 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugModelPresentation.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugModelPresentation.java
@@ -67,7 +67,6 @@ import org.eclipse.debug.core.model.IValue;
 import org.eclipse.debug.core.model.IVariable;
 import org.eclipse.debug.core.model.IWatchExpression;
 import org.eclipse.debug.core.sourcelookup.containers.LocalFileStorage;
-import org.eclipse.debug.internal.ui.DebugUIPlugin;
 import org.eclipse.debug.ui.DebugUITools;
 import org.eclipse.debug.ui.IDebugModelPresentation;
 import org.eclipse.debug.ui.IDebugUIConstants;
@@ -178,7 +177,7 @@ public class CDebugModelPresentation extends LabelProvider implements IDebugMode
 				overlays[OverlayImageDescriptor.TOP_RIGHT] = CDebugImages.DESC_OVRS_GLOBAL;
 			return getImageCache().getImageFor( new OverlayImageDescriptor( baseImage, overlays ) );
 		}
-		return getDefaultImage( element );
+		return null;
 	}
 
 	private Image getBaseImage( Object element ) {
@@ -379,7 +378,7 @@ public class CDebugModelPresentation extends LabelProvider implements IDebugMode
 		catch( CoreException e ) {
 			CDebugUIPlugin.log( e );
 		}
-		return getDefaultText( element );
+		return null;
 	}
 
 	protected String getModuleText( ICModule module, boolean qualified ) {
@@ -423,21 +422,6 @@ public class CDebugModelPresentation extends LabelProvider implements IDebugMode
 		return ( string == null || string.trim().length() == 0 );
 	}
 
-	/**
-	 * Returns a default text label for the debug element
-	 */
-	protected String getDefaultText(Object element) {
-		return DebugUIPlugin.getDefaultLabelProvider().getText( element );
-	}
-
-	/**
-	 * Returns a default image for the debug element
-	 */
-	protected Image getDefaultImage(Object element) {
-		return DebugUIPlugin.getDefaultLabelProvider().getImage( element );
-	}
-
-
 	protected IBreakpoint getBreakpoint( IMarker marker ) {
 		return DebugPlugin.getDefault().getBreakpointManager().getBreakpoint( marker );
 	}