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

ICElements except ITranslationUnit, ICFolder, ... do not adapt to IResource any more.

Browse source
This commit is contained in:
Markus Schorn 2006-08-23 14:50:51 +00:00
parent 140137bb62
commit 697921c9b4
3 changed files with 18 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElement.java
View file

@ -7,6 +7,7 @@
* *
* Contributors: * Contributors:
* QNX Software Systems - Initial API and implementation * QNX Software Systems - Initial API and implementation
* Markus Schorn (Wind River Systems)
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.core.model; package org.eclipse.cdt.internal.core.model;
@ -29,7 +30,6 @@ import org.eclipse.cdt.core.model.ISourceRange;
import org.eclipse.cdt.core.model.ISourceReference; import org.eclipse.cdt.core.model.ISourceReference;
import org.eclipse.cdt.core.model.ISourceRoot; import org.eclipse.cdt.core.model.ISourceRoot;
import org.eclipse.cdt.core.model.IWorkingCopy; import org.eclipse.cdt.core.model.IWorkingCopy;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourceAttributes; import org.eclipse.core.resources.ResourceAttributes;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
@ -57,26 +57,14 @@ public abstract class CElement extends PlatformObject implements ICElement {
* @see org.eclipse.core.runtime.PlatformObject#getAdapter(java.lang.Class) * @see org.eclipse.core.runtime.PlatformObject#getAdapter(java.lang.Class)
*/ */
public Object getAdapter(Class adapter) { public Object getAdapter(Class adapter) {
if(adapter == IFile.class) // handle all kinds of resources
{ if (IResource.class.isAssignableFrom(adapter)) {
IResource resource = getUnderlyingResource(); IResource r= getResource();
if(resource instanceof IFile) if (r != null && adapter.isAssignableFrom(r.getClass())) {
{ return r;
return (IFile) resource;
}
else
{
return null;
} }
} }
if(adapter == IResource.class) return super.getAdapter(adapter);
{
return getUnderlyingResource();
}
else
{
return super.getAdapter(adapter);
}
} }

12
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java
View file

@ -174,14 +174,17 @@ public class MainActionGroup extends CViewActionGroup {
IStructuredSelection celements = (IStructuredSelection) getCView().getViewer().getSelection(); IStructuredSelection celements = (IStructuredSelection) getCView().getViewer().getSelection();
IStructuredSelection resources = SelectionConverter.convertSelectionToResources(celements); IStructuredSelection resources = SelectionConverter.convertSelectionToResources(celements);
addNewMenu(menu, resources);
if (resources.isEmpty()) { if (resources.isEmpty()) {
menu.add(new Separator(IContextMenuConstants.GROUP_GOTO));
menu.add(new Separator(IContextMenuConstants.GROUP_OPEN));
menu.add(new Separator(IContextMenuConstants.GROUP_BUILD));
menu.add(new Separator(IContextMenuConstants.GROUP_REORGANIZE)); menu.add(new Separator(IContextMenuConstants.GROUP_REORGANIZE));
menu.add(new Separator("group.private1")); //$NON-NLS-1$
importAction.selectionChanged(resources); importAction.selectionChanged(resources);
menu.add(importAction); menu.add(importAction);
exportAction.selectionChanged(resources); exportAction.selectionChanged(resources);
menu.add(exportAction); menu.add(exportAction);
menu.add(new Separator("group.private2")); //$NON-NLS-1$
//Can be added once support for manually adding external files to index is established //Can be added once support for manually adding external files to index is established
/*menu.add(new Separator()); /*menu.add(new Separator());
menu.add(addToIndexAction);*/ menu.add(addToIndexAction);*/
@ -190,9 +193,14 @@ public class MainActionGroup extends CViewActionGroup {
menu.add(new Separator(IContextMenuConstants.GROUP_ADDITIONS)); menu.add(new Separator(IContextMenuConstants.GROUP_ADDITIONS));
menu.add(new Separator(IContextMenuConstants.GROUP_ADDITIONS + "-end")); //$NON-NLS-1$ menu.add(new Separator(IContextMenuConstants.GROUP_ADDITIONS + "-end")); //$NON-NLS-1$
menu.add(new Separator()); menu.add(new Separator());
openViewActionGroup.fillContextMenu(menu);
crefactoringActionGroup.fillContextMenu(menu);
return; return;
} }
addNewMenu(menu, resources);
menu.add(new Separator(IContextMenuConstants.GROUP_GOTO)); menu.add(new Separator(IContextMenuConstants.GROUP_GOTO));
gotoGroup.fillContextMenu(menu); gotoGroup.fillContextMenu(menu);
menu.add(new Separator(IContextMenuConstants.GROUP_OPEN)); menu.add(new Separator(IContextMenuConstants.GROUP_OPEN));

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/OpenViewActionGroup.java
View file

@ -163,7 +163,7 @@ public class OpenViewActionGroup extends ActionGroup {
super.fillContextMenu(menu); super.fillContextMenu(menu);
// if (!fIsTypeHiararchyViewerOwner) // if (!fIsTypeHiararchyViewerOwner)
// appendToGroup(menu, fOpenTypeHierarchy); // appendToGroup(menu, fOpenTypeHierarchy);
if (!fIsCallHiararchyViewerOwner) { if (!fIsCallHiararchyViewerOwner && fOpenCallHierarchy.isEnabled()) {
menu.appendToGroup(fGroupName, fOpenCallHierarchy); menu.appendToGroup(fGroupName, fOpenCallHierarchy);
} }
// appendToGroup(menu, fOpenSuperImplementation); // appendToGroup(menu, fOpenSuperImplementation);