From 11577c15eb8ff17fe2c9034c3009bc52c6a2313e Mon Sep 17 00:00:00 2001 From: Mikhail Khodjaiants Date: Thu, 6 Feb 2003 21:26:20 +0000 Subject: [PATCH] Removed warnings. --- debug/org.eclipse.cdt.debug.ui/ChangeLog | 8 ++++++++ .../internal/ui/AddAddressBreakpointActionDelegate.java | 3 ++- .../internal/ui/actions/AddExpressionActionDelegate.java | 4 ++-- .../internal/ui/actions/CBreakpointPropertiesDialog.java | 2 +- .../cdt/debug/ui/sourcelookup/CUISourceLocator.java | 3 ++- .../cdt/debug/ui/sourcelookup/SourceLookupBlock.java | 3 ++- 6 files changed, 17 insertions(+), 6 deletions(-) diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog index 98801fbcf21..bbe482ce445 100644 --- a/debug/org.eclipse.cdt.debug.ui/ChangeLog +++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog @@ -1,3 +1,11 @@ +2003-02-05 Mikhail Khodjaiants + Removed warnings. + * AddAddressBreakpointActionDelegate.java + * AddExpressionActionDelegate.java + * CBreakpointPropertiesDialog.java + * CUISourceLocator.java + * SourceLookupBlock.java + 2003-02-05 Mikhail Khodjaiants Implementation of the 'Resume At C/C++ Line' action. * RunToLineActionDelegate.java diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/AddAddressBreakpointActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/AddAddressBreakpointActionDelegate.java index b106687f601..a2b43dc3e59 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/AddAddressBreakpointActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/AddAddressBreakpointActionDelegate.java @@ -13,6 +13,7 @@ import org.eclipse.debug.core.model.IDebugElement; import org.eclipse.debug.core.model.IDebugTarget; import org.eclipse.jface.dialogs.IInputValidator; import org.eclipse.jface.dialogs.InputDialog; +import org.eclipse.jface.window.Window; /** * @@ -68,7 +69,7 @@ public class AddAddressBreakpointActionDelegate extends AbstractListenerActionDe "Enter address:", null, new AddressValidator() ); - if ( dialog.open() == dialog.OK ) + if ( dialog.open() == Window.OK ) { CDebugModel.createAddressBreakpoint( ((IExecFileInfo)getDebugTarget( element ).getAdapter( IExecFileInfo.class )).getExecFile(), parseValue( dialog.getValue().trim() ), diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddExpressionActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddExpressionActionDelegate.java index 2d817506c07..01f725a4700 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddExpressionActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddExpressionActionDelegate.java @@ -147,7 +147,7 @@ public class AddExpressionActionDelegate extends AbstractEditorActionDelegate */ protected void showExpressionView() { - IWorkbenchPage page = CDebugUIPlugin.getDefault().getActivePage(); + IWorkbenchPage page = CDebugUIPlugin.getActivePage(); if ( page != null ) { IViewPart part = page.findView( IDebugUIConstants.ID_EXPRESSION_VIEW ); @@ -159,7 +159,7 @@ public class AddExpressionActionDelegate extends AbstractEditorActionDelegate } catch( PartInitException e ) { - CDebugUIPlugin.getDefault().log( e.getStatus() ); + CDebugUIPlugin.log( e.getStatus() ); } } else diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPropertiesDialog.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPropertiesDialog.java index f300056a823..e3947ca17f6 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPropertiesDialog.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPropertiesDialog.java @@ -460,7 +460,7 @@ public class CBreakpointPropertiesDialog extends Dialog fTitleImage.setBackground( bg ); fTitleImage.setImage( CDebugUIPlugin.getDefault().getImageRegistry().get( PREF_DLG_TITLE_IMG ) ); gd = new GridData(); - gd.horizontalAlignment = gd.END; + gd.horizontalAlignment = GridData.END; fTitleImage.setLayoutData( gd ); return fTitleArea; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/CUISourceLocator.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/CUISourceLocator.java index a72876d3e88..b4354671fa1 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/CUISourceLocator.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/CUISourceLocator.java @@ -21,6 +21,7 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.debug.core.model.IStackFrame; import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.jface.window.Window; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; @@ -259,7 +260,7 @@ public class CUISourceLocator implements IAdaptable wizard = new AddSourceLocationWizard( fSourceLocator.getSourceLocations() ); } WizardDialog dialog = new WizardDialog( CDebugUIPlugin.getActiveWorkbenchShell(), wizard ); - if ( dialog.open() == dialog.OK ) + if ( dialog.open() == Window.OK ) { fSourceLocator.addSourceLocation( wizard.getSourceLocation() ); fNewLocationAttached = true; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/SourceLookupBlock.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/SourceLookupBlock.java index 7c3ab7db163..9a467a5f3a1 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/SourceLookupBlock.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/SourceLookupBlock.java @@ -17,6 +17,7 @@ import org.eclipse.cdt.debug.internal.ui.dialogfields.ListDialogField; import org.eclipse.cdt.debug.internal.ui.wizards.AddSourceLocationWizard; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.window.Window; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Image; @@ -161,7 +162,7 @@ public class SourceLookupBlock { AddSourceLocationWizard wizard = new AddSourceLocationWizard( getSourceLocations() ); WizardDialog dialog = new WizardDialog( fControl.getShell(), wizard ); - if ( dialog.open() == dialog.OK ) + if ( dialog.open() == Window.OK ) { fSourceListField.addElement( wizard.getSourceLocation() ); }