1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-04 14:55:41 +02:00

Warning cleanup.

This commit is contained in:
Mikhail Khodjaiants 2005-06-09 21:31:06 +00:00
parent 7891decbff
commit e76316f9bc
3 changed files with 7 additions and 20 deletions

View file

@ -2,6 +2,10 @@
Warning cleanup. Warning cleanup.
* CDebugModelPresentation.java * CDebugModelPresentation.java
2005-06-09 Mikhail Khodjaiants
Warning cleanup.
* CBreakpointUpdater.java
2005-06-09 Mikhail Khodjaiants 2005-06-09 Mikhail Khodjaiants
Bug 94139: User-defined register groups. Bug 94139: User-defined register groups.
Externalized strings for the "Restore Default Register Groups" action. Externalized strings for the "Restore Default Register Groups" action.

View file

@ -19,7 +19,6 @@ import org.eclipse.core.runtime.CoreException;
import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.model.IBreakpoint; import org.eclipse.debug.core.model.IBreakpoint;
import org.eclipse.debug.core.model.IDebugTarget; import org.eclipse.debug.core.model.IDebugTarget;
import org.eclipse.debug.internal.ui.DebugUIPlugin;
import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Display;
/** /**
@ -122,7 +121,7 @@ public class CBreakpointUpdater implements ICBreakpointListener {
} }
private void asyncExec( Runnable r ) { private void asyncExec( Runnable r ) {
Display display = DebugUIPlugin.getStandardDisplay(); Display display = Display.getDefault();
if ( display != null ) if ( display != null )
display.asyncExec( r ); display.asyncExec( r );
} }

View file

@ -67,7 +67,6 @@ import org.eclipse.debug.core.model.IValue;
import org.eclipse.debug.core.model.IVariable; import org.eclipse.debug.core.model.IVariable;
import org.eclipse.debug.core.model.IWatchExpression; import org.eclipse.debug.core.model.IWatchExpression;
import org.eclipse.debug.core.sourcelookup.containers.LocalFileStorage; 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.DebugUITools;
import org.eclipse.debug.ui.IDebugModelPresentation; import org.eclipse.debug.ui.IDebugModelPresentation;
import org.eclipse.debug.ui.IDebugUIConstants; 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; overlays[OverlayImageDescriptor.TOP_RIGHT] = CDebugImages.DESC_OVRS_GLOBAL;
return getImageCache().getImageFor( new OverlayImageDescriptor( baseImage, overlays ) ); return getImageCache().getImageFor( new OverlayImageDescriptor( baseImage, overlays ) );
} }
return getDefaultImage( element ); return null;
} }
private Image getBaseImage( Object element ) { private Image getBaseImage( Object element ) {
@ -379,7 +378,7 @@ public class CDebugModelPresentation extends LabelProvider implements IDebugMode
catch( CoreException e ) { catch( CoreException e ) {
CDebugUIPlugin.log( e ); CDebugUIPlugin.log( e );
} }
return getDefaultText( element ); return null;
} }
protected String getModuleText( ICModule module, boolean qualified ) { 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 ); 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 ) { protected IBreakpoint getBreakpoint( IMarker marker ) {
return DebugPlugin.getDefault().getBreakpointManager().getBreakpoint( marker ); return DebugPlugin.getDefault().getBreakpointManager().getBreakpoint( marker );
} }