mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Merge remote branch 'cdt/master' into sd90

Browse source
This commit is contained in:
Andrew Gvozdev 2011-11-04 15:31:55 -04:00
commit d0407361a8
3 changed files with 30 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AbstractCModelOutlinePage.java
View file

@ -315,6 +315,7 @@ public abstract class AbstractCModelOutlinePage extends Page implements IContent
/* /*
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/ */
@Override
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
public Object getAdapter(Class key) { public Object getAdapter(Class key) {
if (key == IShowInSource.class) { if (key == IShowInSource.class) {
@ -322,6 +323,7 @@ public abstract class AbstractCModelOutlinePage extends Page implements IContent
} }
if (key == IShowInTargetList.class) { if (key == IShowInTargetList.class) {
return new IShowInTargetList() { return new IShowInTargetList() {
@Override
public String[] getShowInTargetIds() { public String[] getShowInTargetIds() {
return new String[] { ProjectExplorer.VIEW_ID }; return new String[] { ProjectExplorer.VIEW_ID };
} }
@ -340,6 +342,7 @@ public abstract class AbstractCModelOutlinePage extends Page implements IContent
*/ */
protected IShowInSource getShowInSource() { protected IShowInSource getShowInSource() {
return new IShowInSource() { return new IShowInSource() {
@Override
public ShowInContext getShowInContext() { public ShowInContext getShowInContext() {
return new ShowInContext( return new ShowInContext(
null, null,
@ -355,6 +358,7 @@ public abstract class AbstractCModelOutlinePage extends Page implements IContent
*/ */
protected IShowInTarget getShowInTarget() { protected IShowInTarget getShowInTarget() {
return new IShowInTarget() { return new IShowInTarget() {
@Override
public boolean show(ShowInContext context) { public boolean show(ShowInContext context) {
ISelection sel= context.getSelection(); ISelection sel= context.getSelection();
if (sel instanceof ITextSelection) { if (sel instanceof ITextSelection) {
@ -457,13 +461,13 @@ public abstract class AbstractCModelOutlinePage extends Page implements IContent
} }
protected ProblemTreeViewer createTreeViewer(Composite parent) { protected ProblemTreeViewer createTreeViewer(Composite parent) {
fTreeViewer = new OutlineTreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL); ProblemTreeViewer treeViewer = new OutlineTreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
fTreeViewer.setContentProvider(createContentProvider(fTreeViewer)); treeViewer.setContentProvider(createContentProvider(treeViewer));
fTreeViewer.setLabelProvider(new DecoratingCLabelProvider(createLabelProvider(), true)); treeViewer.setLabelProvider(new DecoratingCLabelProvider(createLabelProvider(), true));
fTreeViewer.setAutoExpandLevel(3); treeViewer.setAutoExpandLevel(3);
fTreeViewer.setUseHashlookup(true); treeViewer.setUseHashlookup(true);
fTreeViewer.addSelectionChangedListener(this); treeViewer.addSelectionChangedListener(this);
return fTreeViewer; return treeViewer;
} }
private CUILabelProvider createLabelProvider() { private CUILabelProvider createLabelProvider() {
@ -478,6 +482,7 @@ public abstract class AbstractCModelOutlinePage extends Page implements IContent
MenuManager manager= new MenuManager(fContextMenuId); MenuManager manager= new MenuManager(fContextMenuId);
manager.setRemoveAllWhenShown(true); manager.setRemoveAllWhenShown(true);
manager.addMenuListener(new IMenuListener() { manager.addMenuListener(new IMenuListener() {
@Override
public void menuAboutToShow(IMenuManager manager) { public void menuAboutToShow(IMenuManager manager) {
contextMenuAboutToShow(manager); contextMenuAboutToShow(manager);
} }
@ -487,6 +492,7 @@ public abstract class AbstractCModelOutlinePage extends Page implements IContent
control.setMenu(fMenu); control.setMenu(fMenu);
fTreeViewer.addDoubleClickListener(new IDoubleClickListener() { fTreeViewer.addDoubleClickListener(new IDoubleClickListener() {
@Override
public void doubleClick(DoubleClickEvent event) { public void doubleClick(DoubleClickEvent event) {
if (fOpenIncludeAction != null) { if (fOpenIncludeAction != null) {
fOpenIncludeAction.run(); fOpenIncludeAction.run();
@ -660,6 +666,7 @@ public abstract class AbstractCModelOutlinePage extends Page implements IContent
return null; return null;
} }
@Override
public void addSelectionChangedListener(ISelectionChangedListener listener) { public void addSelectionChangedListener(ISelectionChangedListener listener) {
fSelectionChangedListeners.add(listener); fSelectionChangedListeners.add(listener);
} }
@ -696,6 +703,7 @@ public abstract class AbstractCModelOutlinePage extends Page implements IContent
return fTreeViewer.getControl(); return fTreeViewer.getControl();
} }
@Override
public ISelection getSelection() { public ISelection getSelection() {
if (fTreeViewer == null) if (fTreeViewer == null)
return StructuredSelection.EMPTY; return StructuredSelection.EMPTY;
@ -712,10 +720,12 @@ public abstract class AbstractCModelOutlinePage extends Page implements IContent
return fTreeViewer; return fTreeViewer;
} }
@Override
public void removeSelectionChangedListener(ISelectionChangedListener listener) { public void removeSelectionChangedListener(ISelectionChangedListener listener) {
fSelectionChangedListeners.remove(listener); fSelectionChangedListeners.remove(listener);
} }
@Override
public void selectionChanged(SelectionChangedEvent event) { public void selectionChanged(SelectionChangedEvent event) {
fireSelectionChanged(event.getSelection()); fireSelectionChanged(event.getSelection());
} }
@ -728,6 +738,7 @@ public abstract class AbstractCModelOutlinePage extends Page implements IContent
fTreeViewer.getControl().setFocus(); fTreeViewer.getControl().setFocus();
} }
@Override
public void setSelection(ISelection selection) { public void setSelection(ISelection selection) {
if (fTreeViewer != null) if (fTreeViewer != null)
fTreeViewer.setSelection(selection); fTreeViewer.setSelection(selection);

32
dsf/org.eclipse.cdt.dsf.ui/.settings/.api_filters
View file

@ -8,36 +8,4 @@
</message_arguments> </message_arguments>
</filter> </filter>
</resource> </resource>
<resource path="src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/provisional/DisassemblySelection.java" type="org.eclipse.cdt.dsf.debug.internal.ui.disassembly.provisional.DisassemblySelection">
<filter id="305365105">
<message_arguments>
<message_argument value="org.eclipse.cdt.dsf.debug.internal.ui.disassembly.provisional.DisassemblySelection"/>
<message_argument value="org.eclipse.cdt.dsf.ui_2.2.0"/>
</message_arguments>
</filter>
</resource>
<resource path="src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/provisional/IBreakpointLocationProvider.java" type="org.eclipse.cdt.dsf.debug.internal.ui.disassembly.provisional.IBreakpointLocationProvider">
<filter id="305365105">
<message_arguments>
<message_argument value="org.eclipse.cdt.dsf.debug.internal.ui.disassembly.provisional.IBreakpointLocationProvider"/>
<message_argument value="org.eclipse.cdt.dsf.ui_2.2.0"/>
</message_arguments>
</filter>
</resource>
<resource path="src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/provisional/IDisassemblyPart.java" type="org.eclipse.cdt.dsf.debug.internal.ui.disassembly.provisional.IDisassemblyPart">
<filter id="305365105">
<message_arguments>
<message_argument value="org.eclipse.cdt.dsf.debug.internal.ui.disassembly.provisional.IDisassemblyPart"/>
<message_argument value="org.eclipse.cdt.dsf.ui_2.2.0"/>
</message_arguments>
</filter>
</resource>
<resource path="src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/provisional/IDisassemblySelection.java" type="org.eclipse.cdt.dsf.debug.internal.ui.disassembly.provisional.IDisassemblySelection">
<filter id="305365105">
<message_arguments>
<message_argument value="org.eclipse.cdt.dsf.debug.internal.ui.disassembly.provisional.IDisassemblySelection"/>
<message_argument value="org.eclipse.cdt.dsf.ui_2.2.0"/>
</message_arguments>
</filter>
</resource>
</component> </component>

15
dsf/org.eclipse.cdt.dsf.ui/plugin.xml
View file

@ -421,21 +421,6 @@
type="org.eclipse.debug.ui.IDebugView"> type="org.eclipse.debug.ui.IDebugView">
</propertyTester> </propertyTester>
<propertyTester
class="org.eclipse.cdt.dsf.debug.internal.ui.viewmodel.actions.UpdateScopesPropertyTester"
id="org.eclipse.cdt.dsf.debug.ui.selectionUpdateScopesTester"
namespace="org.eclipse.cdt.dsf.debug.ui"
properties="areUpdateScopesSupported,isUpdateScopeAvailable,isUpdateScopeActive"
type="org.eclipse.cdt.dsf.ui.viewmodel.IVMContext">
</propertyTester>
<propertyTester
class="org.eclipse.cdt.dsf.debug.internal.ui.viewmodel.actions.UpdateScopesPropertyTester"
id="org.eclipse.cdt.dsf.debug.ui.partUpdateScopesTester"
namespace="org.eclipse.cdt.dsf.debug.ui"
properties="areUpdateScopesSupported,isUpdateScopeAvailable,isUpdateScopeActive"
type="org.eclipse.debug.ui.IDebugView">
</propertyTester>
<propertyTester <propertyTester
class="org.eclipse.cdt.dsf.debug.ui.viewmodel.numberformat.NumberFormatsPropertyTester" class="org.eclipse.cdt.dsf.debug.ui.viewmodel.numberformat.NumberFormatsPropertyTester"
id="org.eclipse.cdt.dsf.debug.ui.selectionNumberFormatsTester" id="org.eclipse.cdt.dsf.debug.ui.selectionNumberFormatsTester"