mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-08 10:16:03 +02:00
Code Issues Wiki Activity

Warning cleanup.

Browse source
This commit is contained in:
Mikhail Khodjaiants 2005-06-10 15:01:20 +00:00
parent fa8a5c4410
commit cc72de6f60
12 changed files with 50 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
debug/org.eclipse.cdt.debug.ui/ChangeLog
View file

@ -1,3 +1,17 @@
2005-06-10 Mikhail Khodjaiants
Warning cleanup.
* AddExpressionEditorActionDelegate.java
* ExpressionDialog.java
* ManageFunctionBreakpointActionDelegate.java
* ResumeAtLineActionDelegate.java
* RetargetAction.java
* RunToLineAdapter.java
* ToggleBreakpointRulerAction.java
* ToggleWatchpointActionDelegate.java
* ThreadFilterEditor.java
* DisassemblyAnnotationModel.java
* DisassemblyView.java
2005-06-09 Mikhail Khodjaiants
Warning cleanup.
* CDebugModelPresentation.java

3
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddExpressionEditorActionDelegate.java
View file

@ -15,7 +15,6 @@ import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.model.IDebugElement;
import org.eclipse.debug.core.model.IWatchExpression;
import org.eclipse.debug.internal.ui.DebugUIPlugin;
import org.eclipse.debug.ui.DebugUITools;
import org.eclipse.debug.ui.IDebugUIConstants;
import org.eclipse.jface.action.IAction;
@ -96,7 +95,7 @@ public class AddExpressionEditorActionDelegate extends ActionDelegate implements
}
private void activateExpressionView() {
IWorkbenchWindow window = DebugUIPlugin.getActiveWorkbenchWindow();
IWorkbenchWindow window = CDebugUIPlugin.getActiveWorkbenchWindow();
if ( window != null ) {
IWorkbenchPage page = window.getActivePage();
if ( page != null ) {

4
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ExpressionDialog.java
View file

@ -10,7 +10,7 @@
***********************************************************************/
package org.eclipse.cdt.debug.internal.ui.actions;
import org.eclipse.debug.internal.ui.DebugPluginImages;
import org.eclipse.debug.ui.DebugUITools;
import org.eclipse.debug.ui.IDebugUIConstants;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
@ -51,7 +51,7 @@ public class ExpressionDialog extends Dialog {
protected void configureShell( Shell shell ) {
super.configureShell( shell );
shell.setText( ActionMessages.getString( "ExpressionDialog.0" ) ); //$NON-NLS-1$
shell.setImage( DebugPluginImages.getImage( IDebugUIConstants.IMG_OBJS_EXPRESSION ) );
shell.setImage( DebugUITools.getImage( IDebugUIConstants.IMG_OBJS_EXPRESSION ) );
}
protected Control createContents( Composite parent ) {

10
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ManageFunctionBreakpointActionDelegate.java
View file

@ -11,8 +11,8 @@
package org.eclipse.cdt.debug.internal.ui.actions;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.debug.internal.ui.DebugUIPlugin;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.ui.IObjectActionDelegate;
import org.eclipse.ui.IWorkbenchPart;
@ -48,10 +48,10 @@ public class ManageFunctionBreakpointActionDelegate extends ActionDelegate imple
getBreakpointAdapter().toggleMethodBreakpoints( getTargetPart(), getSelection() );
}
catch( CoreException e ) {
DebugUIPlugin.errorDialog( getTargetPart().getSite().getShell(),
ActionMessages.getString( "ManageFunctionBreakpointActionDelegate.Error_1" ), //$NON-NLS-1$
ActionMessages.getString( "ManageFunctionBreakpointActionDelegate.Operation_failed_1" ), //$NON-NLS-1$
e.getStatus() );
ErrorDialog.openError( getTargetPart().getSite().getShell(),
ActionMessages.getString( "ManageFunctionBreakpointActionDelegate.Error_1" ), //$NON-NLS-1$
ActionMessages.getString( "ManageFunctionBreakpointActionDelegate.Operation_failed_1" ), //$NON-NLS-1$
e.getStatus() );
}
}

4
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ResumeAtLineActionDelegate.java
View file

@ -15,9 +15,9 @@ import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdapterManager;
import org.eclipse.core.runtime.Platform;
import org.eclipse.debug.core.model.ISuspendResume;
import org.eclipse.debug.internal.ui.DebugUIPlugin;
import org.eclipse.debug.ui.IDebugUIConstants;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
@ -113,7 +113,7 @@ public class ResumeAtLineActionDelegate implements IEditorActionDelegate, IViewA
fPartTarget.resumeAtLine( fActivePart, fActivePart.getSite().getSelectionProvider().getSelection(), fTargetElement );
}
catch( CoreException e ) {
DebugUIPlugin.errorDialog( fActivePart.getSite().getWorkbenchWindow().getShell(), ActionMessages.getString( "ResumeAtLineActionDelegate.1" ), ActionMessages.getString( "ResumeAtLineActionDelegate.2" ), e.getStatus() ); //$NON-NLS-1$ //$NON-NLS-2$
ErrorDialog.openError( fActivePart.getSite().getWorkbenchWindow().getShell(), ActionMessages.getString( "ResumeAtLineActionDelegate.1" ), ActionMessages.getString( "ResumeAtLineActionDelegate.2" ), e.getStatus() ); //$NON-NLS-1$ //$NON-NLS-2$
}
}
}

4
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RetargetAction.java
View file

@ -14,8 +14,8 @@ import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IAdapterManager;
import org.eclipse.core.runtime.Platform;
import org.eclipse.debug.internal.ui.DebugUIPlugin;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
@ -95,7 +95,7 @@ public abstract class RetargetAction implements IWorkbenchWindowActionDelegate,
try {
performAction(fTargetAdapter, getTargetSelection(), fActivePart);
} catch (CoreException e) {
DebugUIPlugin.errorDialog(fWindow.getShell(), ActionMessages.getString("RetargetAction.2"), ActionMessages.getString("RetargetAction.3"), e.getStatus()); //$NON-NLS-1$ //$NON-NLS-2$
ErrorDialog.openError(fWindow.getShell(), ActionMessages.getString("RetargetAction.2"), ActionMessages.getString("RetargetAction.3"), e.getStatus()); //$NON-NLS-1$ //$NON-NLS-2$
}
}
}

6
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RunToLineAdapter.java
View file

@ -28,7 +28,7 @@ import org.eclipse.core.runtime.Status;
import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.model.ISuspendResume;
import org.eclipse.debug.internal.ui.DebugUIPlugin;
import org.eclipse.debug.ui.DebugUITools;
import org.eclipse.debug.ui.IDebugUIConstants;
import org.eclipse.debug.ui.actions.IRunToLineTarget;
import org.eclipse.jface.text.IDocument;
@ -73,7 +73,7 @@ public class RunToLineAdapter implements IRunToLineTarget {
public void run() {
try {
runToLine.runToLine( fileName, lineNumber, DebugUIPlugin.getDefault().getPluginPreferences().getBoolean( IDebugUIConstants.PREF_SKIP_BREAKPOINTS_DURING_RUN_TO_LINE ) );
runToLine.runToLine( fileName, lineNumber, DebugUITools.getPreferenceStore().getBoolean( IDebugUIConstants.PREF_SKIP_BREAKPOINTS_DURING_RUN_TO_LINE ) );
}
catch( DebugException e ) {
failed( e );
@ -103,7 +103,7 @@ public class RunToLineAdapter implements IRunToLineTarget {
public void run() {
try {
runToAddress.runToAddress( address, DebugUIPlugin.getDefault().getPluginPreferences().getBoolean( IDebugUIConstants.PREF_SKIP_BREAKPOINTS_DURING_RUN_TO_LINE ) );
runToAddress.runToAddress( address, DebugUITools.getPreferenceStore().getBoolean( IDebugUIConstants.PREF_SKIP_BREAKPOINTS_DURING_RUN_TO_LINE ) );
}
catch( DebugException e ) {
failed( e );

10
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ToggleBreakpointRulerAction.java
View file

@ -15,8 +15,8 @@ import org.eclipse.cdt.debug.internal.ui.IInternalCDebugUIConstants;
import org.eclipse.cdt.debug.internal.ui.views.disassembly.DisassemblyView;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.internal.ui.DebugUIPlugin;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
@ -72,10 +72,10 @@ public class ToggleBreakpointRulerAction extends Action {
fBreakpointAdapter.toggleLineBreakpoints( getTargetPart(), getTargetSelection() );
}
catch( CoreException e ) {
DebugUIPlugin.errorDialog( getTargetPart().getSite().getShell(),
ActionMessages.getString( "ToggleBreakpointRulerAction.Error_1" ), //$NON-NLS-1$
ActionMessages.getString( "ToggleBreakpointRulerAction.Operation_failed_1" ), //$NON-NLS-1$
e.getStatus() );
ErrorDialog.openError( getTargetPart().getSite().getShell(),
ActionMessages.getString( "ToggleBreakpointRulerAction.Error_1" ), //$NON-NLS-1$
ActionMessages.getString( "ToggleBreakpointRulerAction.Operation_failed_1" ), //$NON-NLS-1$
e.getStatus() );
}
}

10
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ToggleWatchpointActionDelegate.java
View file

@ -11,8 +11,8 @@
package org.eclipse.cdt.debug.internal.ui.actions;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.debug.internal.ui.DebugUIPlugin;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.ui.IObjectActionDelegate;
import org.eclipse.ui.IWorkbenchPart;
@ -51,10 +51,10 @@ public class ToggleWatchpointActionDelegate extends ActionDelegate implements IO
getBreakpointAdapter().toggleWatchpoints( getTargetPart(), getSelection() );
}
catch( CoreException e ) {
DebugUIPlugin.errorDialog( getTargetPart().getSite().getShell(),
ActionMessages.getString( "ToggleWatchpointActionDelegate.Error_1" ), //$NON-NLS-1$
ActionMessages.getString( "ToggleWatchpointActionDelegate.Operation_failed_1" ), //$NON-NLS-1$
e.getStatus() );
ErrorDialog.openError( getTargetPart().getSite().getShell(),
ActionMessages.getString( "ToggleWatchpointActionDelegate.Error_1" ), //$NON-NLS-1$
ActionMessages.getString( "ToggleWatchpointActionDelegate.Operation_failed_1" ), //$NON-NLS-1$
e.getStatus() );
}
}

12
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/ThreadFilterEditor.java
View file

@ -15,6 +15,7 @@ import java.util.List;
import org.eclipse.cdt.debug.core.model.ICBreakpoint;
import org.eclipse.cdt.debug.core.model.ICDebugTarget;
import org.eclipse.cdt.debug.core.model.ICThread;
import org.eclipse.cdt.debug.ui.CDebugUIPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.DebugPlugin;
@ -24,7 +25,6 @@ import org.eclipse.debug.core.model.IDebugElement;
import org.eclipse.debug.core.model.IDebugTarget;
import org.eclipse.debug.core.model.IStackFrame;
import org.eclipse.debug.core.model.IThread;
import org.eclipse.debug.internal.ui.DebugUIPlugin;
import org.eclipse.debug.ui.DebugUITools;
import org.eclipse.jface.viewers.AbstractTreeViewer;
import org.eclipse.jface.viewers.CheckStateChangedEvent;
@ -73,7 +73,7 @@ public class ThreadFilterEditor {
threads = target.getThreads();
}
catch( DebugException exception ) {
DebugUIPlugin.log( exception );
CDebugUIPlugin.log( exception );
return;
}
for( int i = 0; i < threads.length; i++ ) {
@ -94,7 +94,7 @@ public class ThreadFilterEditor {
threads = target.getThreads();
}
catch( DebugException exception ) {
DebugUIPlugin.log( exception );
CDebugUIPlugin.log( exception );
return;
}
int checkedNumber = 0;
@ -141,7 +141,7 @@ public class ThreadFilterEditor {
return ((ICDebugTarget)parent).getThreads();
}
catch( DebugException e ) {
DebugUIPlugin.log( e );
CDebugUIPlugin.log( e );
}
}
}
@ -297,7 +297,7 @@ public class ThreadFilterEditor {
}
}
catch( CoreException e ) {
DebugUIPlugin.log( e );
CDebugUIPlugin.log( e );
}
}
@ -323,7 +323,7 @@ public class ThreadFilterEditor {
DebugPlugin.getDefault().getBreakpointManager().fireBreakpointChanged( breakpoint );
}
catch( CoreException e ) {
DebugUIPlugin.log( e );
CDebugUIPlugin.log( e );
}
}
}

4
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/disassembly/DisassemblyAnnotationModel.java
View file

@ -14,12 +14,10 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import org.eclipse.cdt.debug.core.model.ICLineBreakpoint;
import org.eclipse.core.resources.IMarker;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.model.IBreakpoint;
import org.eclipse.debug.internal.ui.DebugUIPlugin;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.Position;
@ -185,7 +183,7 @@ public class DisassemblyAnnotationModel extends AnnotationModel {
}
private void asyncExec( Runnable r ) {
Display display = DebugUIPlugin.getStandardDisplay();
Display display = Display.getDefault();
if ( display != null )
display.asyncExec( r );
}

7
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/disassembly/DisassemblyView.java
View file

@ -76,6 +76,7 @@ import org.eclipse.ui.ISelectionListener;
import org.eclipse.ui.IViewPart;
import org.eclipse.ui.IWorkbenchActionConstants;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.editors.text.EditorsUI;
import org.eclipse.ui.internal.editors.text.EditorsPlugin;
import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants;
import org.eclipse.ui.texteditor.AnnotationPreference;
@ -281,7 +282,7 @@ public class DisassemblyView extends AbstractDebugEventHandlerView
viewer.configure( new DisassemblyViewerConfiguration() );
getSourceViewerDecorationSupport( viewer );
EditorsPlugin.getDefault().getPreferenceStore().addPropertyChangeListener( this );
getEditorPreferenceStore().addPropertyChangeListener( this );
CDebugUIPlugin.getDefault().getPreferenceStore().addPropertyChangeListener( this );
getSite().getPage().addSelectionListener( IDebugUIConstants.ID_DEBUG_VIEW, this );
getSite().setSelectionProvider( viewer.getSelectionProvider() );
@ -476,7 +477,7 @@ public class DisassemblyView extends AbstractDebugEventHandlerView
getSite().getPage().removeSelectionListener( IDebugUIConstants.ID_DEBUG_VIEW, this );
JFaceResources.getFontRegistry().removeListener( this );
JFaceResources.getColorRegistry().removeListener( this );
EditorsPlugin.getDefault().getPreferenceStore().removePropertyChangeListener( this );
getEditorPreferenceStore().removePropertyChangeListener( this );
CDebugUIPlugin.getDefault().getPreferenceStore().removePropertyChangeListener( this );
if ( fSourceViewerDecorationSupport != null ) {
@ -669,7 +670,7 @@ public class DisassemblyView extends AbstractDebugEventHandlerView
}
private IPreferenceStore getEditorPreferenceStore() {
return EditorsPlugin.getDefault().getPreferenceStore();
return EditorsUI.getPreferenceStore();
}
public DisassemblyDocumentProvider getDocumentProvider() {