mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-09-09 19:43:27 +02:00
Bug 328472 - "C/C++ Build" does not show under Preferences
This commit is contained in:
Anton Leherbauer
parent
679eb0d976
commit
af5c98eed9
2 changed files with 34 additions and 89 deletions
|
|
@ -479,22 +479,11 @@
|
||||||
id="org.eclipse.cdt.managedbuilder.ui.properties.Page_head_build"
|
id="org.eclipse.cdt.managedbuilder.ui.properties.Page_head_build"
|
||||||
name="%page.c.build"
|
name="%page.c.build"
|
||||||
>
|
>
|
||||||
<filter
|
|
||||||
name="projectNature"
|
|
||||||
value="org.eclipse.cdt.managedbuilder.core.managedBuildNature">
|
|
||||||
</filter>
|
|
||||||
<enabledWhen>
|
<enabledWhen>
|
||||||
<or>
|
<adapt type="org.eclipse.core.resources.IResource">
|
||||||
<adapt
|
<test property="org.eclipse.core.resources.projectNature"
|
||||||
type="org.eclipse.core.resources.IProject">
|
value="org.eclipse.cdt.managedbuilder.core.managedBuildNature"/>
|
||||||
</adapt>
|
</adapt>
|
||||||
|
|
||||||
<instanceof value="org.eclipse.core.resources.IFolder"/>
|
|
||||||
<instanceof value="org.eclipse.cdt.core.model.ICContainer"/>
|
|
||||||
|
|
||||||
<instanceof value="org.eclipse.cdt.core.model.ITranslationUnit"/>
|
|
||||||
<instanceof value="org.eclipse.core.resources.IFile"/>
|
|
||||||
</or>
|
|
||||||
</enabledWhen>
|
</enabledWhen>
|
||||||
</page>
|
</page>
|
||||||
<page
|
<page
|
||||||
|
|
@ -503,15 +492,11 @@
|
||||||
category="org.eclipse.cdt.managedbuilder.ui.properties.Page_head_build"
|
category="org.eclipse.cdt.managedbuilder.ui.properties.Page_head_build"
|
||||||
name="%CDTVariablesProperty.name"
|
name="%CDTVariablesProperty.name"
|
||||||
>
|
>
|
||||||
<filter
|
|
||||||
name="projectNature"
|
|
||||||
value="org.eclipse.cdt.managedbuilder.core.managedBuildNature">
|
|
||||||
</filter>
|
|
||||||
<enabledWhen>
|
<enabledWhen>
|
||||||
<or>
|
<adapt type="org.eclipse.core.resources.IProject">
|
||||||
<instanceof value="org.eclipse.core.resources.IProject"/>
|
<test property="org.eclipse.core.resources.projectNature"
|
||||||
<instanceof value="org.eclipse.cdt.core.model.ICProject"/>
|
value="org.eclipse.cdt.managedbuilder.core.managedBuildNature"/>
|
||||||
</or>
|
</adapt>
|
||||||
</enabledWhen>
|
</enabledWhen>
|
||||||
</page>
|
</page>
|
||||||
|
|
||||||
|
|
@ -521,21 +506,11 @@
|
||||||
category="org.eclipse.cdt.ui.newui.Page_head_general"
|
category="org.eclipse.cdt.ui.newui.Page_head_general"
|
||||||
name="%CDTPathSymbolsProperty.name"
|
name="%CDTPathSymbolsProperty.name"
|
||||||
>
|
>
|
||||||
<filter
|
|
||||||
name="projectNature"
|
|
||||||
value="org.eclipse.cdt.managedbuilder.core.managedBuildNature">
|
|
||||||
</filter>
|
|
||||||
<enabledWhen>
|
<enabledWhen>
|
||||||
<or>
|
<adapt type="org.eclipse.core.resources.IResource">
|
||||||
<instanceof value="org.eclipse.core.resources.IProject"/>
|
<test property="org.eclipse.core.resources.projectNature"
|
||||||
<instanceof value="org.eclipse.cdt.core.model.ICProject"/>
|
value="org.eclipse.cdt.managedbuilder.core.managedBuildNature"/>
|
||||||
|
</adapt>
|
||||||
<instanceof value="org.eclipse.core.resources.IFolder"/>
|
|
||||||
<instanceof value="org.eclipse.cdt.core.model.ICContainer"/>
|
|
||||||
|
|
||||||
<instanceof value="org.eclipse.core.resources.IFile"/>
|
|
||||||
<instanceof value="org.eclipse.cdt.core.model.ITranslationUnit"/>
|
|
||||||
</or>
|
|
||||||
</enabledWhen>
|
</enabledWhen>
|
||||||
</page>
|
</page>
|
||||||
|
|
||||||
|
|
@ -545,16 +520,12 @@
|
||||||
category="org.eclipse.cdt.ui.newui.Page_head_general"
|
category="org.eclipse.cdt.ui.newui.Page_head_general"
|
||||||
name="%CDTExpPathSymbolsProperty.name"
|
name="%CDTExpPathSymbolsProperty.name"
|
||||||
>
|
>
|
||||||
<filter
|
|
||||||
name="projectNature"
|
|
||||||
value="org.eclipse.cdt.managedbuilder.core.managedBuildNature">
|
|
||||||
</filter>
|
|
||||||
<enabledWhen>
|
<enabledWhen>
|
||||||
<and>
|
<and>
|
||||||
<or>
|
<adapt type="org.eclipse.core.resources.IProject">
|
||||||
<instanceof value="org.eclipse.core.resources.IProject"/>
|
<test property="org.eclipse.core.resources.projectNature"
|
||||||
<instanceof value="org.eclipse.cdt.core.model.ICProject"/>
|
value="org.eclipse.cdt.managedbuilder.core.managedBuildNature"/>
|
||||||
</or>
|
</adapt>
|
||||||
<test property="org.eclipse.cdt.ui.pageEnabled" value="export" />
|
<test property="org.eclipse.cdt.ui.pageEnabled" value="export" />
|
||||||
</and>
|
</and>
|
||||||
</enabledWhen>
|
</enabledWhen>
|
||||||
|
|
@ -566,21 +537,11 @@
|
||||||
category="org.eclipse.cdt.managedbuilder.ui.properties.Page_head_build"
|
category="org.eclipse.cdt.managedbuilder.ui.properties.Page_head_build"
|
||||||
name="%CDTBuildProperty.name"
|
name="%CDTBuildProperty.name"
|
||||||
>
|
>
|
||||||
<filter
|
|
||||||
name="projectNature"
|
|
||||||
value="org.eclipse.cdt.managedbuilder.core.managedBuildNature">
|
|
||||||
</filter>
|
|
||||||
<enabledWhen>
|
<enabledWhen>
|
||||||
<or>
|
<adapt type="org.eclipse.core.resources.IResource">
|
||||||
<instanceof value="org.eclipse.core.resources.IProject"/>
|
<test property="org.eclipse.core.resources.projectNature"
|
||||||
<instanceof value="org.eclipse.cdt.core.model.ICProject"/>
|
value="org.eclipse.cdt.managedbuilder.core.managedBuildNature"/>
|
||||||
|
</adapt>
|
||||||
<instanceof value="org.eclipse.core.resources.IFolder"/>
|
|
||||||
<instanceof value="org.eclipse.cdt.core.model.ICContainer"/>
|
|
||||||
|
|
||||||
<instanceof value="org.eclipse.core.resources.IFile"/>
|
|
||||||
<instanceof value="org.eclipse.cdt.core.model.ITranslationUnit"/>
|
|
||||||
</or>
|
|
||||||
</enabledWhen>
|
</enabledWhen>
|
||||||
</page>
|
</page>
|
||||||
<page
|
<page
|
||||||
|
|
@ -589,22 +550,12 @@
|
||||||
category="org.eclipse.cdt.managedbuilder.ui.properties.Page_head_build"
|
category="org.eclipse.cdt.managedbuilder.ui.properties.Page_head_build"
|
||||||
name="%CDTToolchainProperty.name"
|
name="%CDTToolchainProperty.name"
|
||||||
>
|
>
|
||||||
<filter
|
|
||||||
name="projectNature"
|
|
||||||
value="org.eclipse.cdt.managedbuilder.core.managedBuildNature">
|
|
||||||
</filter>
|
|
||||||
<enabledWhen>
|
<enabledWhen>
|
||||||
<and>
|
<and>
|
||||||
<or>
|
<adapt type="org.eclipse.core.resources.IResource">
|
||||||
<instanceof value="org.eclipse.core.resources.IProject"/>
|
<test property="org.eclipse.core.resources.projectNature"
|
||||||
<instanceof value="org.eclipse.cdt.core.model.ICProject"/>
|
value="org.eclipse.cdt.managedbuilder.core.managedBuildNature"/>
|
||||||
|
</adapt>
|
||||||
<instanceof value="org.eclipse.core.resources.IFolder"/>
|
|
||||||
<instanceof value="org.eclipse.cdt.core.model.ICContainer"/>
|
|
||||||
|
|
||||||
<instanceof value="org.eclipse.core.resources.IFile"/>
|
|
||||||
<instanceof value="org.eclipse.cdt.core.model.ITranslationUnit"/>
|
|
||||||
</or>
|
|
||||||
<test property="org.eclipse.cdt.ui.pageEnabled" value="toolEdit" />
|
<test property="org.eclipse.cdt.ui.pageEnabled" value="toolEdit" />
|
||||||
</and>
|
</and>
|
||||||
</enabledWhen>
|
</enabledWhen>
|
||||||
|
|
@ -616,15 +567,11 @@
|
||||||
category="org.eclipse.cdt.managedbuilder.ui.properties.Page_head_build"
|
category="org.eclipse.cdt.managedbuilder.ui.properties.Page_head_build"
|
||||||
name="%Discovery.options"
|
name="%Discovery.options"
|
||||||
>
|
>
|
||||||
<filter
|
|
||||||
name="projectNature"
|
|
||||||
value="org.eclipse.cdt.managedbuilder.core.managedBuildNature">
|
|
||||||
</filter>
|
|
||||||
<enabledWhen>
|
<enabledWhen>
|
||||||
<or>
|
<adapt type="org.eclipse.core.resources.IProject">
|
||||||
<instanceof value="org.eclipse.core.resources.IProject"/>
|
<test property="org.eclipse.core.resources.projectNature"
|
||||||
<instanceof value="org.eclipse.cdt.core.model.ICProject"/>
|
value="org.eclipse.cdt.managedbuilder.core.managedBuildNature"/>
|
||||||
</or>
|
</adapt>
|
||||||
</enabledWhen>
|
</enabledWhen>
|
||||||
</page>
|
</page>
|
||||||
<page
|
<page
|
||||||
|
|
@ -633,15 +580,11 @@
|
||||||
category="org.eclipse.cdt.managedbuilder.ui.properties.Page_head_build"
|
category="org.eclipse.cdt.managedbuilder.ui.properties.Page_head_build"
|
||||||
name="%Environment"
|
name="%Environment"
|
||||||
>
|
>
|
||||||
<filter
|
|
||||||
name="projectNature"
|
|
||||||
value="org.eclipse.cdt.managedbuilder.core.managedBuildNature">
|
|
||||||
</filter>
|
|
||||||
<enabledWhen>
|
<enabledWhen>
|
||||||
<or>
|
<adapt type="org.eclipse.core.resources.IProject">
|
||||||
<instanceof value="org.eclipse.core.resources.IProject"/>
|
<test property="org.eclipse.core.resources.projectNature"
|
||||||
<instanceof value="org.eclipse.cdt.core.model.ICProject"/>
|
value="org.eclipse.cdt.managedbuilder.core.managedBuildNature"/>
|
||||||
</or>
|
</adapt>
|
||||||
</enabledWhen>
|
</enabledWhen>
|
||||||
</page>
|
</page>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1217,6 +1217,8 @@ implements
|
||||||
internalElement = ((ICElement)el).getResource();
|
internalElement = ((ICElement)el).getResource();
|
||||||
else if (el instanceof IResource)
|
else if (el instanceof IResource)
|
||||||
internalElement = (IResource)el;
|
internalElement = (IResource)el;
|
||||||
|
else
|
||||||
|
internalElement = (IResource) el.getAdapter(IResource.class);
|
||||||
if (internalElement == null) return false;
|
if (internalElement == null) return false;
|
||||||
isProject = internalElement instanceof IProject;
|
isProject = internalElement instanceof IProject;
|
||||||
isFolder = internalElement instanceof IFolder;
|
isFolder = internalElement instanceof IFolder;
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue