Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 167679 Details for
Bug 312098
[Memory Browser] do not create a rendering automatically when Memory Browser is opened
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
Proposed fix
MemoryBrowserError (text/plain), 9.01 KB, created by
Teodor Madan
on 2010-05-10 06:15:30 EDT
(
hide
)
Description:
Proposed fix
Filename:
MIME Type:
Creator:
Teodor Madan
Created:
2010-05-10 06:15:30 EDT
Size:
9.01 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.cdt.debug.ui.memory.memorybrowser >Index: src/org/eclipse/cdt/debug/ui/memory/memorybrowser/GoToAddressBarWidget.java >=================================================================== >RCS file: /cvsroot/tools/org.eclipse.cdt/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/GoToAddressBarWidget.java,v >retrieving revision 1.2 >diff -u -r1.2 GoToAddressBarWidget.java >--- src/org/eclipse/cdt/debug/ui/memory/memorybrowser/GoToAddressBarWidget.java 19 Oct 2009 13:41:17 -0000 1.2 >+++ src/org/eclipse/cdt/debug/ui/memory/memorybrowser/GoToAddressBarWidget.java 10 May 2010 10:09:18 -0000 >@@ -11,8 +11,14 @@ > > package org.eclipse.cdt.debug.ui.memory.memorybrowser; > >+import org.eclipse.core.runtime.IStatus; > import org.eclipse.jface.dialogs.IDialogConstants; >+import org.eclipse.jface.fieldassist.ControlDecoration; >+import org.eclipse.jface.fieldassist.FieldDecoration; >+import org.eclipse.jface.fieldassist.FieldDecorationRegistry; > import org.eclipse.swt.SWT; >+import org.eclipse.swt.events.ModifyEvent; >+import org.eclipse.swt.events.ModifyListener; > import org.eclipse.swt.layout.GridData; > import org.eclipse.swt.layout.GridLayout; > import org.eclipse.swt.widgets.Button; >@@ -24,6 +30,9 @@ > public class GoToAddressBarWidget { > > private Text fExpression; >+ private ControlDecoration fEmptyExpression; >+ private ControlDecoration fWrongExpression; >+ > private Button fOKButton; > private Button fOKNewTabButton; > private Composite fComposite; >@@ -47,18 +56,63 @@ > layout.marginLeft = 0; > fComposite.setLayout(layout); > >- fExpression = new Text(fComposite, SWT.SINGLE | SWT.BORDER); >- fExpression.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); >+ fExpression = createExpressionField(fComposite); > > fOKButton = new Button(fComposite, SWT.NONE); > fOKButton.setText(Messages.getString("GoToAddressBarWidget.Go")); //$NON-NLS-1$ >+ fOKButton.setEnabled(false); > > fOKNewTabButton = new Button(fComposite, SWT.NONE); > fOKNewTabButton.setText(Messages.getString("GoToAddressBarWidget.NewTab")); //$NON-NLS-1$ >+ fOKNewTabButton.setEnabled(false); > > return fComposite; > } >- >+ >+ private Text createExpressionField(Composite parent) { >+ Text expression = new Text(parent, SWT.SINGLE | SWT.BORDER); >+ expression.addModifyListener(new ModifyListener() { >+ public void modifyText(ModifyEvent e) { >+ updateButtons(); >+ } >+ }); >+ fEmptyExpression = new ControlDecoration(expression, SWT.LEFT | SWT.CENTER); >+ fEmptyExpression.setDescriptionText("Enter an expression to position rendering"); >+ FieldDecoration fieldDecoration = FieldDecorationRegistry.getDefault() >+ .getFieldDecoration(FieldDecorationRegistry.DEC_REQUIRED); >+ fEmptyExpression.setImage(fieldDecoration.getImage()); >+ >+ fWrongExpression = new ControlDecoration(expression, SWT.LEFT | SWT.TOP); >+ fieldDecoration = FieldDecorationRegistry.getDefault() >+ .getFieldDecoration(FieldDecorationRegistry.DEC_ERROR); >+ fWrongExpression.setImage(fieldDecoration.getImage()); >+ fWrongExpression.hide(); >+ >+ // leave enough room for decorators >+ GridData data = new GridData(GridData.FILL_HORIZONTAL); >+ data.horizontalIndent = Math.max(fEmptyExpression.getImage().getBounds().width, fWrongExpression.getImage().getBounds().width); >+ expression.setLayoutData(data); >+ return expression; >+ } >+ >+ protected void updateButtons() { >+ boolean empty = fExpression.getText().trim().length() == 0; >+ >+ fOKNewTabButton.setEnabled(!empty); >+ fOKButton.setEnabled(!empty); >+ >+ if (empty) >+ fEmptyExpression.show(); >+ else >+ fEmptyExpression.hide(); >+ >+ clearError(); >+ } >+ >+ private void clearError() { >+ fWrongExpression.hide(); >+ } >+ > public int getHeight() > { > int height = fComposite.computeSize(SWT.DEFAULT, SWT.DEFAULT).y; >@@ -83,4 +137,17 @@ > { > return fExpression; > } >+ >+ /** >+ * decorate expression field according to the status >+ * @param message >+ */ >+ public void handleExpressionStatus(final IStatus message) { >+ if (message.isOK()) { >+ clearError(); >+ } else { >+ fWrongExpression.setDescriptionText(message.getMessage()); >+ fWrongExpression.show(); >+ } >+ } > } >\ No newline at end of file >Index: src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java >=================================================================== >RCS file: /cvsroot/tools/org.eclipse.cdt/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java,v >retrieving revision 1.20 >diff -u -r1.20 MemoryBrowser.java >--- src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java 25 Mar 2010 07:24:13 -0000 1.20 >+++ src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java 10 May 2010 10:09:19 -0000 >@@ -36,7 +36,6 @@ > import org.eclipse.debug.core.model.IMemoryBlockRetrievalExtension; > import org.eclipse.debug.core.model.MemoryByte; > import org.eclipse.debug.internal.ui.memory.MemoryRenderingManager; >-import org.eclipse.debug.internal.ui.views.memory.MemoryViewUtil; > import org.eclipse.debug.ui.DebugUITools; > import org.eclipse.debug.ui.contexts.DebugContextEvent; > import org.eclipse.debug.ui.contexts.IDebugContextListener; >@@ -345,12 +344,19 @@ > > if(inNewTab || activeFolder.getSelection() == null) > { >- CTabItem item = createTab(activeFolder, activeFolder.getSelectionIndex() + 1); >- populateTabWithRendering(item, retrieval, context); >- setTabFolder(retrieval, activeFolder); >- activeFolder.setSelection(item); >- getSite().getSelectionProvider().setSelection(new StructuredSelection(item.getData(KEY_RENDERING))); >- } >+ try { >+ IMemoryBlock block = createMemoryBlock(retrieval, expression, context); //$NON-NLS-1$ >+ CTabItem item = createTab(activeFolder, activeFolder.getSelectionIndex() + 1); >+ populateTabWithRendering(item, retrieval, context, block); >+ setTabFolder(retrieval, activeFolder); >+ activeFolder.setSelection(item); >+ getSite().getSelectionProvider().setSelection(new StructuredSelection(item.getData(KEY_RENDERING))); >+ } catch (DebugException e1) { >+ fGotoAddressBar.handleExpressionStatus(new Status(Status.ERROR, MemoryBrowserPlugin.PLUGIN_ID, >+ Messages.getString("MemoryBrowser.FailedToGoToAddressTitle"), e1)); >+ return; >+ } >+ } > > final IRepositionableMemoryRendering rendering = (IRepositionableMemoryRendering) activeFolder.getSelection().getData(KEY_RENDERING); > final String gotoExpression = getAddressSpacePrefix() + expression; >@@ -366,14 +372,21 @@ > if(((IMemoryBlockExtension) rendering.getMemoryBlock()).supportBaseAddressModification()) > ((IMemoryBlockExtension) rendering.getMemoryBlock()).setBaseAddress(newBase); > rendering.goToAddress(newBase); >+ fGotoAddressBar.handleExpressionStatus(Status.OK_STATUS); > runOnUIThread(new Runnable(){ > public void run() > { > updateLabel(activeFolder.getSelection(), rendering); > } > }); >- } catch (DebugException e1) { >- MemoryViewUtil.openError(Messages.getString("MemoryBrowser.FailedToGoToAddressTitle"), "", e1); //$NON-NLS-1$ >+ } catch (final DebugException e1) { >+ // widgets update require Display >+ runOnUIThread(new Runnable(){ >+ public void run() { >+ fGotoAddressBar.handleExpressionStatus(new Status(Status.ERROR, MemoryBrowserPlugin.PLUGIN_ID, >+ Messages.getString("MemoryBrowser.FailedToGoToAddressTitle"), e1)); >+ } >+ }); > } > } > }.start(); >@@ -632,7 +645,7 @@ > { > fStackLayout.topControl = tabFolder; > } >- else >+ else > { > tabFolder = this.createTabFolder(fRenderingsComposite); > tabFolder.addSelectionListener(new SelectionListener() >@@ -643,10 +656,7 @@ > } > }); > >- tabFolder.setData(KEY_RETRIEVAL, retrieval); >- >- CTabItem item = createTab(tabFolder, 0); >- populateTabWithRendering(item, retrieval, context); >+ tabFolder.setData(KEY_RETRIEVAL, retrieval); > setTabFolder(retrieval, tabFolder); > > fStackLayout.topControl = getTabFolder(retrieval); >@@ -678,7 +688,7 @@ > store.setValue(PREF_DEFAULT_RENDERING, defaultRenderingTypeId); > } > >- private void populateTabWithRendering(final CTabItem tab, final IMemoryBlockRetrieval retrieval, Object context) >+ private void populateTabWithRendering(final CTabItem tab, final IMemoryBlockRetrieval retrieval, Object context, IMemoryBlock block) > { > IMemoryRenderingType type = DebugUITools.getMemoryRenderingManager().getRenderingType(getDefaultRenderingTypeId()); > try { >@@ -711,9 +721,7 @@ > public void removeMemoryRendering(IMemoryRendering rendering) {} > > }; >- >- IMemoryBlock block = createMemoryBlock(retrieval, "0", context); //$NON-NLS-1$ >- >+ > fCurrentContainers.add(container); > rendering.init(container, block); > rendering.createControl(tab.getParent());
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 312098
:
167679
|
167680
|
167681
|
168643
|
168813
|
168975
|
170720