From 6892af49a861a1b43f8bf23d134f77475e714511 Mon Sep 17 00:00:00 2001 From: Mikhail Khodjaiants Date: Tue, 11 Jan 2005 20:52:30 +0000 Subject: [PATCH] Replaced deprecated methods and constants. Cleanup. --- debug/org.eclipse.cdt.debug.mi.ui/ChangeLog | 6 ++++++ .../mi/internal/ui/dialogfields/ListDialogField.java | 1 - .../ui/dialogfields/SelectionButtonDialogField.java | 1 - .../ui/dialogfields/StringButtonDialogField.java | 1 - debug/org.eclipse.cdt.debug.ui/ChangeLog | 11 +++++++++++ .../org/eclipse/cdt/debug/internal/ui/SWTUtil.java | 10 +++++----- .../ui/actions/EnableVariablesActionDelegate.java | 12 ++++++------ .../ui/actions/RemoveGlobalsActionDelegate.java | 6 +++--- .../internal/ui/dialogfields/ListDialogField.java | 1 - .../ui/dialogfields/SelectionButtonDialogField.java | 1 - .../ui/dialogfields/StringButtonDialogField.java | 1 - .../ui/preferences/CDebugPreferencePage.java | 4 ++-- .../ui/propertypages/CBreakpointPropertyPage.java | 8 ++++---- 13 files changed, 37 insertions(+), 26 deletions(-) diff --git a/debug/org.eclipse.cdt.debug.mi.ui/ChangeLog b/debug/org.eclipse.cdt.debug.mi.ui/ChangeLog index fd2fae1225f..566ce5e4028 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/ChangeLog +++ b/debug/org.eclipse.cdt.debug.mi.ui/ChangeLog @@ -1,3 +1,9 @@ +2005-01-11 Mikhail Khodjaiants + Replaced deprecated methods and constants. + * ListDialogField.java + * SelectionButtonDialogField.java + * StringButtonDialogField.java + 2004-11-11 Mikhail Khodjaiants Fix for bug 75627: Incorrect limit to port numbers. * TCPSettingsBlock.java diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/ListDialogField.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/ListDialogField.java index 67609c9b590..67615982101 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/ListDialogField.java +++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/ListDialogField.java @@ -281,7 +281,6 @@ public class ListDialogField extends DialogField { gd.horizontalAlignment= GridData.FILL; gd.grabExcessHorizontalSpace= true; gd.verticalAlignment= GridData.BEGINNING; - gd.heightHint = SWTUtil.getButtonHeigthHint(button); gd.widthHint = SWTUtil.getButtonWidthHint(button); button.setLayoutData(gd); diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/SelectionButtonDialogField.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/SelectionButtonDialogField.java index ceace7ac198..6c68bc43940 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/SelectionButtonDialogField.java +++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/SelectionButtonDialogField.java @@ -80,7 +80,6 @@ public class SelectionButtonDialogField extends DialogField { gd.horizontalSpan= nColumns; gd.horizontalAlignment= GridData.FILL; if (fButtonStyle == SWT.PUSH) { - gd.heightHint = SWTUtil.getButtonHeigthHint(button); gd.widthHint = SWTUtil.getButtonWidthHint(button); } diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/StringButtonDialogField.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/StringButtonDialogField.java index 05b7d5ec8e7..a73f820d110 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/StringButtonDialogField.java +++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/StringButtonDialogField.java @@ -79,7 +79,6 @@ public class StringButtonDialogField extends StringDialogField { gd.horizontalAlignment= GridData.FILL; gd.grabExcessHorizontalSpace= false; gd.horizontalSpan= span; - gd.heightHint = SWTUtil.getButtonHeigthHint(button); gd.widthHint = SWTUtil.getButtonWidthHint(button); return gd; } diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog index 9d86ee69a9f..5a17778de97 100644 --- a/debug/org.eclipse.cdt.debug.ui/ChangeLog +++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog @@ -1,3 +1,14 @@ +2005-01-11 Mikhail Khodjaiants + Replaced deprecated methods and constants. Cleanup. + * SWTUtil.java + * EnableVariablesActionDelegate.java + * RemoveGlobalsActionDelegate.java + * ListDialogField.java + * SelectionButtonDialogField.java + * StringButtonDialogField.java + * CDebugPreferencePage.java + * CBreakpointPropertyPage.java + 2005-01-11 Mikhail Khodjaiants Use the asynchronous implementation for resume, suspend, step etc provided by eclipse 3.1. * plugin.xml diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/SWTUtil.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/SWTUtil.java index 7b915bd36f7..2fd7c94aeec 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/SWTUtil.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/SWTUtil.java @@ -70,10 +70,10 @@ public class SWTUtil { /** * Returns a height hint for a button control. */ - public static int getButtonHeigthHint( Button button ) { - PixelConverter converter = new PixelConverter( button ); - return converter.convertVerticalDLUsToPixels( IDialogConstants.BUTTON_HEIGHT ); - } +// public static int getButtonHeigthHint( Button button ) { +// PixelConverter converter = new PixelConverter( button ); +// return converter.convertVerticalDLUsToPixels( IDialogConstants.BUTTON_HEIGHT ); +// } /** * Sets width and height hint for the button control. Note: This @@ -85,8 +85,8 @@ public class SWTUtil { Assert.isNotNull( button ); Object gd = button.getLayoutData(); if ( gd instanceof GridData ) { - ((GridData)gd).heightHint = getButtonHeigthHint( button ); ((GridData)gd).widthHint = getButtonWidthHint( button ); + ((GridData)gd).horizontalAlignment = GridData.FILL; } } } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/EnableVariablesActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/EnableVariablesActionDelegate.java index bf7eca60127..0f347465d00 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/EnableVariablesActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/EnableVariablesActionDelegate.java @@ -78,13 +78,13 @@ public class EnableVariablesActionDelegate implements IViewActionDelegate { final int size = selection.size(); if ( size == 0 ) return; - final Iterator enum = selection.iterator(); + final Iterator it = selection.iterator(); final MultiStatus ms = new MultiStatus( CDebugUIPlugin.getUniqueIdentifier(), DebugException.REQUEST_FAILED, ActionMessages.getString( "EnableVariablesActionDelegate.0" ), null ); //$NON-NLS-1$ BusyIndicator.showWhile( Display.getCurrent(), new Runnable() { public void run() { - while( enum.hasNext() ) { - IEnableDisableTarget target = getEnableDisableTarget( enum.next() ); + while( it.hasNext() ) { + IEnableDisableTarget target = getEnableDisableTarget( it.next() ); if ( target != null ) { try { if ( size > 1 ) { @@ -119,11 +119,11 @@ public class EnableVariablesActionDelegate implements IViewActionDelegate { Object o = sel.getFirstElement(); if ( getEnableDisableTarget( o ) == null ) return; - Iterator enum = sel.iterator(); + Iterator it = sel.iterator(); boolean allEnabled = true; boolean allDisabled = true; - while( enum.hasNext() ) { - IEnableDisableTarget target = getEnableDisableTarget( enum.next() ); + while( it.hasNext() ) { + IEnableDisableTarget target = getEnableDisableTarget( it.next() ); if ( target != null && !target.canEnableDisable() ) continue; if ( target.isEnabled() ) diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RemoveGlobalsActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RemoveGlobalsActionDelegate.java index 5cdb17f32b4..c7850d7dd39 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RemoveGlobalsActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RemoveGlobalsActionDelegate.java @@ -53,10 +53,10 @@ public class RemoveGlobalsActionDelegate extends ActionDelegate implements IView if ( !(selection instanceof IStructuredSelection) ) return; IStructuredSelection ss = (IStructuredSelection)selection; - final Iterator enum = ss.iterator(); + final Iterator it = ss.iterator(); ArrayList list = new ArrayList( ss.size() ); - while( enum.hasNext() ) { - Object obj = enum.next(); + while( it.hasNext() ) { + Object obj = it.next(); if ( obj instanceof ICGlobalVariable ) list.add( obj ); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/ListDialogField.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/ListDialogField.java index c3fccc28ccf..4ca63a00be5 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/ListDialogField.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/ListDialogField.java @@ -281,7 +281,6 @@ public class ListDialogField extends DialogField { gd.horizontalAlignment= GridData.FILL; gd.grabExcessHorizontalSpace= true; gd.verticalAlignment= GridData.BEGINNING; - gd.heightHint = SWTUtil.getButtonHeigthHint(button); gd.widthHint = SWTUtil.getButtonWidthHint(button); button.setLayoutData(gd); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/SelectionButtonDialogField.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/SelectionButtonDialogField.java index ad77bd52922..ee19cc182bc 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/SelectionButtonDialogField.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/SelectionButtonDialogField.java @@ -80,7 +80,6 @@ public class SelectionButtonDialogField extends DialogField { gd.horizontalSpan= nColumns; gd.horizontalAlignment= GridData.FILL; if (fButtonStyle == SWT.PUSH) { - gd.heightHint = SWTUtil.getButtonHeigthHint(button); gd.widthHint = SWTUtil.getButtonWidthHint(button); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/StringButtonDialogField.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/StringButtonDialogField.java index f73e64a3db9..3dbdd60171d 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/StringButtonDialogField.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/StringButtonDialogField.java @@ -79,7 +79,6 @@ public class StringButtonDialogField extends StringDialogField { gd.horizontalAlignment= GridData.FILL; gd.grabExcessHorizontalSpace= false; gd.horizontalSpan= span; - gd.heightHint = SWTUtil.getButtonHeigthHint(button); gd.widthHint = SWTUtil.getButtonWidthHint(button); return gd; } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/CDebugPreferencePage.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/CDebugPreferencePage.java index f9387feed3d..6405ebe4e45 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/CDebugPreferencePage.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/CDebugPreferencePage.java @@ -219,7 +219,7 @@ public class CDebugPreferencePage extends PreferencePage implements IWorkbenchPr GridData data = (GridData)fMaxNumberOfInstructionsText.getTextControl( parent ).getLayoutData(); data.horizontalAlignment = GridData.BEGINNING; data.widthHint = convertWidthInCharsToPixels( NUMBER_OF_DIGITS + 1 ); - fMaxNumberOfInstructionsText.setPreferencePage( this ); + fMaxNumberOfInstructionsText.setPage( this ); fMaxNumberOfInstructionsText.setValidateStrategy( StringFieldEditor.VALIDATE_ON_KEY_STROKE ); fMaxNumberOfInstructionsText.setValidRange( ICDebugConstants.MIN_NUMBER_OF_INSTRUCTIONS, ICDebugConstants.MAX_NUMBER_OF_INSTRUCTIONS ); String minValue = Integer.toString( ICDebugConstants.MIN_NUMBER_OF_INSTRUCTIONS ); @@ -237,7 +237,7 @@ public class CDebugPreferencePage extends PreferencePage implements IWorkbenchPr private void createDisassemblyColorsField( Composite parent ) { fDisassemblySourceColor = new ColorFieldEditor( IInternalCDebugUIConstants.DISASSEMBLY_SOURCE_LINE_COLOR, PreferenceMessages.getString( "CDebugPreferencePage.Color_of_disassembly_source_lines_1" ), parent ); //$NON-NLS-1$ - fDisassemblySourceColor.setPreferencePage( this ); + fDisassemblySourceColor.setPage( this ); fDisassemblySourceColor.setPreferenceStore( getPreferenceStore() ); fDisassemblySourceColor.load(); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/CBreakpointPropertyPage.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/CBreakpointPropertyPage.java index c04843f626e..9ff0f995311 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/CBreakpointPropertyPage.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/CBreakpointPropertyPage.java @@ -88,8 +88,8 @@ public class CBreakpointPropertyPage extends FieldEditorPreferencePage implement * Clears the error message from the message line if the error message is the error message from this field editor. */ protected void clearErrorMessage() { - if ( getPreferencePage() != null ) { - String message = getPreferencePage().getErrorMessage(); + if ( getPage() != null ) { + String message = getPage().getErrorMessage(); if ( message != null ) { if ( getErrorMessage().equals( message ) ) { super.clearErrorMessage(); @@ -138,8 +138,8 @@ public class CBreakpointPropertyPage extends FieldEditorPreferencePage implement * Clears the error message from the message line if the error message is the error message from this field editor. */ protected void clearErrorMessage() { - if ( getPreferencePage() != null ) { - String message = getPreferencePage().getErrorMessage(); + if ( getPage() != null ) { + String message = getPage().getErrorMessage(); if ( message != null ) { if ( getErrorMessage().equals( message ) ) { super.clearErrorMessage();