mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-06-08 10:16:03 +02:00
Added method to replace access to non-accessible method of enclosing type.
This commit is contained in:
parent
d142a758d5
commit
347497be9c
10 changed files with 37 additions and 17 deletions
|
@ -137,7 +137,7 @@ public class AddWatchpointDialog extends Dialog
|
||||||
} );
|
} );
|
||||||
}
|
}
|
||||||
|
|
||||||
private void setOkButtonState()
|
protected void setOkButtonState()
|
||||||
{
|
{
|
||||||
if ( fBtnOk == null )
|
if ( fBtnOk == null )
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -73,8 +73,8 @@ public class CBreakpointPropertiesDialog extends Dialog
|
||||||
{
|
{
|
||||||
if ( wHint != SWT.DEFAULT && hHint != SWT.DEFAULT )
|
if ( wHint != SWT.DEFAULT && hHint != SWT.DEFAULT )
|
||||||
return new Point( wHint, hHint );
|
return new Point( wHint, hHint );
|
||||||
int x = fMinimumPageSize.x;
|
int x = getMinimumPageSize().x;
|
||||||
int y = fMinimumPageSize.y;
|
int y = getMinimumPageSize().y;
|
||||||
|
|
||||||
Control[] children = composite.getChildren();
|
Control[] children = composite.getChildren();
|
||||||
for ( int i = 0; i < children.length; i++ )
|
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 );
|
fOkButton = createButton( parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true );
|
||||||
createButton( parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false );
|
createButton( parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected Point getMinimumPageSize()
|
||||||
|
{
|
||||||
|
return fMinimumPageSize;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -214,7 +214,7 @@ public class ChangeRegisterValueAction extends SelectionProviderAction
|
||||||
/**
|
/**
|
||||||
* Tidy up the widgets that were used
|
* Tidy up the widgets that were used
|
||||||
*/
|
*/
|
||||||
private void cleanup()
|
protected void cleanup()
|
||||||
{
|
{
|
||||||
fKeyReleased = false;
|
fKeyReleased = false;
|
||||||
if ( fEditorText != null )
|
if ( fEditorText != null )
|
||||||
|
|
|
@ -100,7 +100,7 @@ public class ExpressionDialog extends Dialog
|
||||||
return text;
|
return text;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void setOkButtonState()
|
protected void setOkButtonState()
|
||||||
{
|
{
|
||||||
if ( fBtnOk == null )
|
if ( fBtnOk == null )
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -266,7 +266,7 @@ public class CDebugPreferencePage extends PreferencePage implements IWorkbenchPr
|
||||||
/**
|
/**
|
||||||
* Refresh all views in the given workbench page with the given view id
|
* 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 );
|
IViewPart part = page.findView( viewID );
|
||||||
if ( part != null )
|
if ( part != null )
|
||||||
|
|
|
@ -23,12 +23,12 @@ public class ComboFieldEditor extends FieldEditor {
|
||||||
/**
|
/**
|
||||||
* The <code>Combo</code> widget.
|
* The <code>Combo</code> widget.
|
||||||
*/
|
*/
|
||||||
private Combo fCombo;
|
protected Combo fCombo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The value (not the name) of the currently selected item in the Combo widget.
|
* 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
|
* 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];
|
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 );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,8 +10,7 @@ import org.eclipse.cdt.debug.core.IFormattedMemoryBlock;
|
||||||
import org.eclipse.cdt.debug.core.IFormattedMemoryRetrieval;
|
import org.eclipse.cdt.debug.core.IFormattedMemoryRetrieval;
|
||||||
import org.eclipse.cdt.debug.internal.ui.preferences.ICDebugPreferenceConstants;
|
import org.eclipse.cdt.debug.internal.ui.preferences.ICDebugPreferenceConstants;
|
||||||
import org.eclipse.cdt.debug.ui.CDebugUIPlugin;
|
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.jface.util.PropertyChangeEvent;
|
||||||
import org.eclipse.swt.SWT;
|
import org.eclipse.swt.SWT;
|
||||||
import org.eclipse.swt.events.KeyAdapter;
|
import org.eclipse.swt.events.KeyAdapter;
|
||||||
|
@ -61,9 +60,11 @@ public class MemoryControlArea extends Composite
|
||||||
|
|
||||||
private MemoryPresentation createPresentation()
|
private MemoryPresentation createPresentation()
|
||||||
{
|
{
|
||||||
|
/*
|
||||||
IPreferenceStore pstore = CDebugUIPlugin.getDefault().getPreferenceStore();
|
IPreferenceStore pstore = CDebugUIPlugin.getDefault().getPreferenceStore();
|
||||||
char[] paddingCharStr = pstore.getString( ICDebugPreferenceConstants.PREF_MEMORY_PADDING_CHAR ).toCharArray();
|
char[] paddingCharStr = pstore.getString( ICDebugPreferenceConstants.PREF_MEMORY_PADDING_CHAR ).toCharArray();
|
||||||
char paddingChar = ( paddingCharStr.length > 0 ) ? paddingCharStr[0] : '.';
|
char paddingChar = ( paddingCharStr.length > 0 ) ? paddingCharStr[0] : '.';
|
||||||
|
*/
|
||||||
return new MemoryPresentation();
|
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 );
|
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 )
|
public void propertyChange( PropertyChangeEvent event )
|
||||||
|
|
|
@ -81,7 +81,7 @@ public class MemoryText
|
||||||
refresh();
|
refresh();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void handleExtendedModify( ExtendedModifyEvent event )
|
protected void handleExtendedModify( ExtendedModifyEvent event )
|
||||||
{
|
{
|
||||||
if ( event.length != 1 )
|
if ( event.length != 1 )
|
||||||
return;
|
return;
|
||||||
|
@ -137,7 +137,7 @@ public class MemoryText
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void handleVerifyKey( VerifyEvent event )
|
protected void handleVerifyKey( VerifyEvent event )
|
||||||
{
|
{
|
||||||
if ( event.character == SWT.LF ||
|
if ( event.character == SWT.LF ||
|
||||||
event.character == SWT.CR ||
|
event.character == SWT.CR ||
|
||||||
|
|
|
@ -6,7 +6,6 @@
|
||||||
package org.eclipse.cdt.debug.internal.ui.views.memory;
|
package org.eclipse.cdt.debug.internal.ui.views.memory;
|
||||||
|
|
||||||
import org.eclipse.cdt.debug.core.IFormattedMemoryRetrieval;
|
import org.eclipse.cdt.debug.core.IFormattedMemoryRetrieval;
|
||||||
import org.eclipse.debug.core.model.IMemoryBlockRetrieval;
|
|
||||||
import org.eclipse.jface.util.PropertyChangeEvent;
|
import org.eclipse.jface.util.PropertyChangeEvent;
|
||||||
import org.eclipse.jface.viewers.ContentViewer;
|
import org.eclipse.jface.viewers.ContentViewer;
|
||||||
import org.eclipse.jface.viewers.ISelection;
|
import org.eclipse.jface.viewers.ISelection;
|
||||||
|
@ -56,7 +55,6 @@ public class MemoryViewer extends ContentViewer
|
||||||
fControl.setLayout( layout );
|
fControl.setLayout( layout );
|
||||||
fControl.setLayoutData( new GridData( GridData.FILL_BOTH ) );
|
fControl.setLayoutData( new GridData( GridData.FILL_BOTH ) );
|
||||||
fTabFolder = new CTabFolder( fControl, SWT.TOP );
|
fTabFolder = new CTabFolder( fControl, SWT.TOP );
|
||||||
GridData gridData = new GridData();
|
|
||||||
fTabFolder.setLayoutData( new GridData( GridData.FILL_BOTH | GridData.GRAB_VERTICAL ) );
|
fTabFolder.setLayoutData( new GridData( GridData.FILL_BOTH | GridData.GRAB_VERTICAL ) );
|
||||||
for ( int i = 0; i < NUMBER_OF_TABS; ++i )
|
for ( int i = 0; i < NUMBER_OF_TABS; ++i )
|
||||||
{
|
{
|
||||||
|
|
|
@ -57,7 +57,7 @@ public class CUISourceLocator implements IPersistableSourceLocator
|
||||||
* Initially true, until the user checks the 'do not
|
* Initially true, until the user checks the 'do not
|
||||||
* ask again' box.
|
* ask again' box.
|
||||||
*/
|
*/
|
||||||
private boolean fAllowedToAsk;
|
protected boolean fAllowedToAsk;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Add table
Reference in a new issue