1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-06 17:26:01 +02:00

Project Explorer: Fix wizard shortcuts

This commit is contained in:
Anton Leherbauer 2007-04-13 09:30:42 +00:00
parent b6410fac1f
commit 10ceaaeaa3
4 changed files with 52 additions and 57 deletions

View file

@ -435,42 +435,6 @@
profileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"/>
</extension>
<!-- Common Navigator extensions -->
<extension
point="org.eclipse.ui.navigator.navigatorContent">
<commonWizard
associatedExtensionId="org.eclipse.cdt.ui.navigator.content"
menuGroupId="org.eclipse.cdt.ui.newCWizards"
type="new"
wizardId="org.eclipse.cdt.ui.wizards.NewMakeCProjectWizard">
<enablement/>
</commonWizard>
<commonWizard
associatedExtensionId="org.eclipse.cdt.ui.navigator.content"
menuGroupId="org.eclipse.cdt.ui.newCWizards"
type="new"
wizardId="org.eclipse.cdt.make.ui.wizards.NewMakeCCProjectWizard">
<enablement/>
</commonWizard>
<commonWizard
associatedExtensionId="org.eclipse.cdt.ui.navigator.content"
menuGroupId="org.eclipse.cdt.ui.newCWizards"
type="new"
wizardId="org.eclipse.cdt.ui.wizards.ConvertToMakeWizard">
<enablement>
<instanceof value="org.eclipse.core.resources.IProject"/>
</enablement>
</commonWizard>
</extension>
<extension
point="org.eclipse.ui.navigator.viewer">
<viewerContentBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">
<includes>
<contentExtension pattern="org.eclipse.cdt.make.ui.wizards.*"/>
</includes>
</viewerContentBinding>
</extension>
<extension
point="org.eclipse.cdt.ui.cPropertyTab">

View file

@ -161,16 +161,9 @@
point="org.eclipse.ui.navigator.navigatorContent">
<commonWizard
associatedExtensionId="org.eclipse.cdt.ui.navigator.content"
menuGroupId="org.eclipse.cdt.ui.newCWizards"
menuGroupId="org.eclipse.cdt.ui.newProject"
type="new"
wizardId="org.eclipse.cdt.managedbuilder.ui.wizards.StdCCWizard">
<enablement/>
</commonWizard>
<commonWizard
associatedExtensionId="org.eclipse.cdt.ui.navigator.content"
menuGroupId="org.eclipse.cdt.ui.newCWizards"
type="new"
wizardId="org.eclipse.cdt.managedbuilder.ui.wizards.StdCWizard">
wizardId="org.eclipse.cdt.ui.wizards.ConvertToMakeWizard">
<enablement/>
</commonWizard>
</extension>

View file

@ -27,20 +27,26 @@
<factory
class="org.eclipse.cdt.internal.ui.CElementAdapterFactory"
adaptableType="org.eclipse.cdt.core.model.ICElement">
<adapter
type="org.eclipse.core.resources.IResource">
</adapter>
<adapter
type="org.eclipse.ui.model.IWorkbenchAdapter">
</adapter>
<adapter
type="org.eclipse.ui.views.properties.IPropertySource">
</adapter>
<adapter type="org.eclipse.core.resources.IResource"/>
<adapter type="org.eclipse.ui.model.IWorkbenchAdapter"/>
<adapter type="org.eclipse.ui.views.properties.IPropertySource"/>
<adapter type="org.eclipse.ui.progress.IDeferredWorkbenchAdapter"/>
<adapter type="org.eclipse.ui.IActionFilter"/>
<adapter type="org.eclipse.ui.IPersistableElement"/>
</factory>
<factory
class="org.eclipse.cdt.internal.ui.CElementAdapterFactory"
adaptableType="org.eclipse.cdt.core.model.ICContainer">
<adapter type="org.eclipse.core.resources.IFolder"/>
</factory>
<factory
class="org.eclipse.cdt.internal.ui.CElementAdapterFactory"
adaptableType="org.eclipse.cdt.core.model.ITranslationUnit">
<adapter type="org.eclipse.core.resources.IFile"/>
</factory>
<factory
class="org.eclipse.cdt.internal.ui.CProjectAdapterFactory"
adaptableType="org.eclipse.cdt.core.model.ICProject">
@ -1915,6 +1921,38 @@
</or>
</enablement>
</actionProvider>
<commonWizard
associatedExtensionId="org.eclipse.cdt.ui.navigator.content"
menuGroupId="org.eclipse.cdt.ui.newProject"
type="new"
wizardId="org.eclipse.cdt.ui.wizards.NewCWizard1">
<enablement>
<or>
<instanceof value="org.eclipse.cdt.core.model.ICElement" />
<adapt type="org.eclipse.core.resources.IProject">
<test
property="org.eclipse.core.resources.projectNature"
value="org.eclipse.cdt.core.cnature"/>
</adapt>
</or>
</enablement>
</commonWizard>
<commonWizard
associatedExtensionId="org.eclipse.cdt.ui.navigator.content"
menuGroupId="org.eclipse.cdt.ui.newProject"
type="new"
wizardId="org.eclipse.cdt.ui.wizards.NewCWizard2">
<enablement>
<or>
<instanceof value="org.eclipse.cdt.core.model.ICElement" />
<adapt type="org.eclipse.core.resources.IProject">
<test
property="org.eclipse.core.resources.projectNature"
value="org.eclipse.cdt.core.cnature"/>
</adapt>
</or>
</enablement>
</commonWizard>
<commonWizard
associatedExtensionId="org.eclipse.cdt.ui.navigator.content"
menuGroupId="org.eclipse.cdt.ui"
@ -1987,6 +2025,7 @@
<instanceof value="org.eclipse.cdt.core.model.ISourceReference"/>
<instanceof value="org.eclipse.cdt.core.model.ICContainer"/>
<instanceof value="org.eclipse.cdt.core.model.ICProject"/>
<adapt type="org.eclipse.core.resources.IResource"/>
</or>
</possibleDropTargets>
</dropAssistant>

View file

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2005, 2006 IBM Corporation and others.
* Copyright (c) 2005, 2007 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@ -62,8 +62,7 @@ public class CElementAdapterFactory implements IAdapterFactory {
if (resource != null && key.isAssignableFrom(resource.getClass())) {
return resource;
}
return null;
} if (IPersistableElement.class.equals(key)) {
} else if (IPersistableElement.class.equals(key)) {
return new PersistableCElementFactory(celem);
} else if (IDeferredWorkbenchAdapter.class.equals(key)) {
return getDeferredWorkbenchAdapter(celem);