From 347497be9c7f05be0ba2a60fd519ea17b6b25e3a Mon Sep 17 00:00:00 2001 From: Mikhail Khodjaiants Date: Tue, 8 Oct 2002 20:35:59 +0000 Subject: [PATCH] Added method to replace access to non-accessible method of enclosing type. --- .../ui/actions/AddWatchpointDialog.java | 2 +- .../actions/CBreakpointPropertiesDialog.java | 9 +++++++-- .../ui/actions/ChangeRegisterValueAction.java | 2 +- .../internal/ui/actions/ExpressionDialog.java | 2 +- .../ui/preferences/CDebugPreferencePage.java | 2 +- .../ui/preferences/ComboFieldEditor.java | 20 +++++++++++++++++-- .../ui/views/memory/MemoryControlArea.java | 9 +++++---- .../internal/ui/views/memory/MemoryText.java | 4 ++-- .../ui/views/memory/MemoryViewer.java | 2 -- .../cdt/debug/ui/CUISourceLocator.java | 2 +- 10 files changed, 37 insertions(+), 17 deletions(-) diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddWatchpointDialog.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddWatchpointDialog.java index 6def2c629f2..09fe35a28c3 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddWatchpointDialog.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddWatchpointDialog.java @@ -137,7 +137,7 @@ public class AddWatchpointDialog extends Dialog } ); } - private void setOkButtonState() + protected void setOkButtonState() { if ( fBtnOk == null ) return; 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 501910e1936..e2a70cfa74b 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 @@ -73,8 +73,8 @@ public class CBreakpointPropertiesDialog extends Dialog { if ( wHint != SWT.DEFAULT && hHint != SWT.DEFAULT ) return new Point( wHint, hHint ); - int x = fMinimumPageSize.x; - int y = fMinimumPageSize.y; + int x = getMinimumPageSize().x; + int y = getMinimumPageSize().y; Control[] children = composite.getChildren(); for ( int i = 0; i < children.length; i++ ) @@ -497,4 +497,9 @@ public class CBreakpointPropertiesDialog extends Dialog fOkButton = createButton( parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true ); createButton( parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false ); } + + protected Point getMinimumPageSize() + { + return fMinimumPageSize; + } } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ChangeRegisterValueAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ChangeRegisterValueAction.java index a2dae2a6586..b61be612ded 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ChangeRegisterValueAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ChangeRegisterValueAction.java @@ -214,7 +214,7 @@ public class ChangeRegisterValueAction extends SelectionProviderAction /** * Tidy up the widgets that were used */ - private void cleanup() + protected void cleanup() { fKeyReleased = false; if ( fEditorText != null ) diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ExpressionDialog.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ExpressionDialog.java index 8b2a15c8855..299e790ddf5 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ExpressionDialog.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ExpressionDialog.java @@ -100,7 +100,7 @@ public class ExpressionDialog extends Dialog return text; } - private void setOkButtonState() + protected void setOkButtonState() { if ( fBtnOk == null ) return; 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 8c7665565c3..2af3f6e8b6b 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 @@ -266,7 +266,7 @@ public class CDebugPreferencePage extends PreferencePage implements IWorkbenchPr /** * Refresh all views in the given workbench page with the given view id */ - private void refreshViews( IWorkbenchPage page, String viewID ) + protected void refreshViews( IWorkbenchPage page, String viewID ) { IViewPart part = page.findView( viewID ); if ( part != null ) diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/ComboFieldEditor.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/ComboFieldEditor.java index 841e92f3093..be7b90a3f89 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/ComboFieldEditor.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/ComboFieldEditor.java @@ -23,12 +23,12 @@ public class ComboFieldEditor extends FieldEditor { /** * The Combo widget. */ - private Combo fCombo; + protected Combo fCombo; /** * The value (not the name) of the currently selected item in the Combo widget. */ - private String fValue; + protected String fValue; /** * The names (labels) and underlying values to populate the combo widget. These should be @@ -175,4 +175,20 @@ public class ComboFieldEditor extends FieldEditor { fValue = fEntryNamesAndValues[0][1]; } } + + /* (non-Javadoc) + * @see org.eclipse.jface.preference.FieldEditor#fireValueChanged(String, Object, Object) + */ + protected void fireValueChanged( String property, Object oldValue, Object newValue ) + { + super.fireValueChanged( property, oldValue, newValue ); + } + + /* (non-Javadoc) + * @see org.eclipse.jface.preference.FieldEditor#setPresentsDefaultValue(boolean) + */ + protected void setPresentsDefaultValue( boolean b ) + { + super.setPresentsDefaultValue( b ); + } } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryControlArea.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryControlArea.java index 9bb255c0d9f..34a88cbe50c 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryControlArea.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryControlArea.java @@ -10,8 +10,7 @@ import org.eclipse.cdt.debug.core.IFormattedMemoryBlock; import org.eclipse.cdt.debug.core.IFormattedMemoryRetrieval; import org.eclipse.cdt.debug.internal.ui.preferences.ICDebugPreferenceConstants; import org.eclipse.cdt.debug.ui.CDebugUIPlugin; -import org.eclipse.debug.core.model.IMemoryBlockRetrieval; -import org.eclipse.jface.preference.IPreferenceStore; +//import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.swt.SWT; import org.eclipse.swt.events.KeyAdapter; @@ -61,9 +60,11 @@ public class MemoryControlArea extends Composite private MemoryPresentation createPresentation() { +/* IPreferenceStore pstore = CDebugUIPlugin.getDefault().getPreferenceStore(); char[] paddingCharStr = pstore.getString( ICDebugPreferenceConstants.PREF_MEMORY_PADDING_CHAR ).toCharArray(); char paddingChar = ( paddingCharStr.length > 0 ) ? paddingCharStr[0] : '.'; +*/ return new MemoryPresentation(); } @@ -103,9 +104,9 @@ public class MemoryControlArea extends Composite return new MemoryText( parent, SWT.BORDER | SWT.HIDE_SELECTION | SWT.V_SCROLL | SWT.H_SCROLL, presentation ); } - private void handleAddressEnter() + protected void handleAddressEnter() { - String address = fAddressText.getText().trim(); +// String address = fAddressText.getText().trim(); } public void propertyChange( PropertyChangeEvent event ) diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryText.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryText.java index a7d1f13268b..8e7c533c032 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryText.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryText.java @@ -81,7 +81,7 @@ public class MemoryText refresh(); } - private void handleExtendedModify( ExtendedModifyEvent event ) + protected void handleExtendedModify( ExtendedModifyEvent event ) { if ( event.length != 1 ) return; @@ -137,7 +137,7 @@ public class MemoryText } } - private void handleVerifyKey( VerifyEvent event ) + protected void handleVerifyKey( VerifyEvent event ) { if ( event.character == SWT.LF || event.character == SWT.CR || diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryViewer.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryViewer.java index 75b16a66e19..f1329d8e9ab 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryViewer.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryViewer.java @@ -6,7 +6,6 @@ package org.eclipse.cdt.debug.internal.ui.views.memory; import org.eclipse.cdt.debug.core.IFormattedMemoryRetrieval; -import org.eclipse.debug.core.model.IMemoryBlockRetrieval; import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.jface.viewers.ContentViewer; import org.eclipse.jface.viewers.ISelection; @@ -56,7 +55,6 @@ public class MemoryViewer extends ContentViewer fControl.setLayout( layout ); fControl.setLayoutData( new GridData( GridData.FILL_BOTH ) ); fTabFolder = new CTabFolder( fControl, SWT.TOP ); - GridData gridData = new GridData(); fTabFolder.setLayoutData( new GridData( GridData.FILL_BOTH | GridData.GRAB_VERTICAL ) ); for ( int i = 0; i < NUMBER_OF_TABS; ++i ) { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/CUISourceLocator.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/CUISourceLocator.java index b1cdd329baa..3d9e3de955a 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/CUISourceLocator.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/CUISourceLocator.java @@ -57,7 +57,7 @@ public class CUISourceLocator implements IPersistableSourceLocator * Initially true, until the user checks the 'do not * ask again' box. */ - private boolean fAllowedToAsk; + protected boolean fAllowedToAsk; /**