Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Overbey2012-05-08 12:19:40 +0000
committerJeffrey Overbey2012-05-08 12:19:40 +0000
commit1ab302ef8cb8c56d66987cf1dd37a7fbff1e9e9c (patch)
tree312d6306d97b9d0b47939cae68b13992fb8d4cda
parentdecb12d8d1d3ecf54631047c337d1524b2f48598 (diff)
downloadorg.eclipse.photran-1ab302ef8cb8c56d66987cf1dd37a7fbff1e9e9c.tar.gz
org.eclipse.photran-1ab302ef8cb8c56d66987cf1dd37a7fbff1e9e9c.tar.xz
org.eclipse.photran-1ab302ef8cb8c56d66987cf1dd37a7fbff1e9e9c.zip
Bug 378761 - Property tester org.eclipse.cdt.ui.pageEnabled gone in CDT
8.1
-rw-r--r--org.eclipse.photran.managedbuilder.ui/plugin.properties2
-rw-r--r--org.eclipse.photran.managedbuilder.ui/plugin.xml140
2 files changed, 45 insertions, 97 deletions
diff --git a/org.eclipse.photran.managedbuilder.ui/plugin.properties b/org.eclipse.photran.managedbuilder.ui/plugin.properties
index 3b3d0b9c..76b4b6ea 100644
--- a/org.eclipse.photran.managedbuilder.ui/plugin.properties
+++ b/org.eclipse.photran.managedbuilder.ui/plugin.properties
@@ -25,6 +25,6 @@ CDTPathSymbolsProperty.name=Paths and Symbols
CDTExpPathSymbolsProperty.name=Export Settings
CDTBuildProperty.name=Settings
CDTToolchainProperty.name=Tool Chain Editor
-CDTVariablesProperty.name=Variables
+CDTVariablesProperty.name=Build Variables
Discovery.options=Discovery Options
Environment=Environment
diff --git a/org.eclipse.photran.managedbuilder.ui/plugin.xml b/org.eclipse.photran.managedbuilder.ui/plugin.xml
index 53dff7dc..0abc076a 100644
--- a/org.eclipse.photran.managedbuilder.ui/plugin.xml
+++ b/org.eclipse.photran.managedbuilder.ui/plugin.xml
@@ -26,31 +26,20 @@
value="org.eclipse.cdt.managedbuilder.core.managedBuildNature">
</filter>
</page-->
-
+
+ <!-- The following property pages are from CDT, but they are placed
+ under the Fortran Build category. Enablement settings are copied
+ verbatim from org.eclipse.cdt.managedbuilder.ui's plugin.xml -->
<page
class="org.eclipse.cdt.managedbuilder.ui.properties.Page_head_build"
id="org.eclipse.photran.managedbuilder.ui.properties.Page_head_build"
name="%page.c.build"
>
- <filter
- name="projectNature"
- value="org.eclipse.cdt.managedbuilder.core.managedBuildNature">
- </filter>
- <filter
- name="projectNature"
- value="org.eclipse.photran.core.fnature">
- </filter>
<enabledWhen>
- <or>
- <instanceof value="org.eclipse.core.resources.IProject"/>
- <instanceof value="org.eclipse.cdt.core.model.ICProject"/>
-
- <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>
+ <adapt type="org.eclipse.core.resources.IResource">
+ <test property="org.eclipse.core.resources.projectNature"
+ value="org.eclipse.cdt.managedbuilder.core.managedBuildNature"/>
+ </adapt>
</enabledWhen>
</page>
<page
@@ -59,39 +48,25 @@
category="org.eclipse.photran.managedbuilder.ui.properties.Page_head_build"
name="%CDTVariablesProperty.name"
>
- <filter
- name="projectNature"
- value="org.eclipse.cdt.managedbuilder.core.managedBuildNature">
- </filter>
<enabledWhen>
- <or>
- <instanceof value="org.eclipse.core.resources.IProject"/>
- <instanceof value="org.eclipse.cdt.core.model.ICProject"/>
- </or>
+ <adapt type="org.eclipse.core.resources.IProject">
+ <test property="org.eclipse.core.resources.projectNature"
+ value="org.eclipse.cdt.managedbuilder.core.managedBuildNature"/>
+ </adapt>
</enabledWhen>
</page>
-
+
<page
class="org.eclipse.cdt.managedbuilder.ui.properties.Page_PathAndSymb"
id="org.eclipse.photran.managedbuilder.ui.properties.Page_PathAndSymb"
category="org.eclipse.photran.ui.newui.Page_head_general"
name="%CDTPathSymbolsProperty.name"
>
- <filter
- name="projectNature"
- value="org.eclipse.cdt.managedbuilder.core.managedBuildNature">
- </filter>
<enabledWhen>
- <or>
- <instanceof value="org.eclipse.core.resources.IProject"/>
- <instanceof value="org.eclipse.cdt.core.model.ICProject"/>
-
- <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>
+ <adapt type="org.eclipse.core.resources.IResource">
+ <test property="org.eclipse.core.resources.projectNature"
+ value="org.eclipse.cdt.managedbuilder.core.managedBuildNature"/>
+ </adapt>
</enabledWhen>
</page>
@@ -107,11 +82,11 @@
</filter>
<enabledWhen>
<and>
- <or>
- <instanceof value="org.eclipse.core.resources.IProject"/>
- <instanceof value="org.eclipse.cdt.core.model.ICProject"/>
- </or>
- <test property="org.eclipse.cdt.ui.pageEnabled" value="export" />
+ <adapt type="org.eclipse.core.resources.IProject">
+ <test property="org.eclipse.core.resources.projectNature"
+ value="org.eclipse.cdt.managedbuilder.core.managedBuildNature"/>
+ </adapt>
+ <test property="org.eclipse.cdt.ui.checkPreference" value="org.eclipse.cdt.ui:properties.export.page.enable=true"/>
</and>
</enabledWhen>
</page>
@@ -127,16 +102,10 @@
value="org.eclipse.cdt.managedbuilder.core.managedBuildNature">
</filter>
<enabledWhen>
- <or>
- <instanceof value="org.eclipse.core.resources.IProject"/>
- <instanceof value="org.eclipse.cdt.core.model.ICProject"/>
-
- <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>
+ <adapt type="org.eclipse.core.resources.IResource">
+ <test property="org.eclipse.core.resources.projectNature"
+ value="org.eclipse.cdt.managedbuilder.core.managedBuildNature"/>
+ </adapt>
</enabledWhen>
</page>
<page
@@ -145,23 +114,13 @@
category="org.eclipse.photran.managedbuilder.ui.properties.Page_head_build"
name="%CDTToolchainProperty.name"
>
- <filter
- name="projectNature"
- value="org.eclipse.cdt.managedbuilder.core.managedBuildNature">
- </filter>
<enabledWhen>
<and>
- <or>
- <instanceof value="org.eclipse.core.resources.IProject"/>
- <instanceof value="org.eclipse.cdt.core.model.ICProject"/>
-
- <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" />
+ <adapt type="org.eclipse.core.resources.IResource">
+ <test property="org.eclipse.core.resources.projectNature"
+ value="org.eclipse.cdt.managedbuilder.core.managedBuildNature"/>
+ </adapt>
+ <test property="org.eclipse.cdt.ui.checkPreference" value="org.eclipse.cdt.ui:properties.toolchain.modification.disable=false"/>
</and>
</enabledWhen>
</page>
@@ -177,22 +136,15 @@
value="org.eclipse.cdt.managedbuilder.core.managedBuildNature">
</filter>
<enabledWhen>
- <or>
- <instanceof value="org.eclipse.core.resources.IProject"/>
- <instanceof value="org.eclipse.cdt.core.model.ICProject"/>
-
- <instanceof value="org.eclipse.core.resources.IFolder"/>
- <instanceof value="org.eclipse.cdt.core.model.ICContainer"/>
-
- <and>
- <instanceof value="org.eclipse.core.resources.IFile"/>
- <test property="org.eclipse.cdt.ui.isSource" value="" />
- </and>
- <and>
- <instanceof value="org.eclipse.cdt.core.model.ITranslationUnit"/>
- <test property="org.eclipse.cdt.ui.isSource" value="" />
- </and>
- </or>
+ <adapt type="org.eclipse.core.resources.IProject">
+ <and>
+ <test property="org.eclipse.core.resources.projectNature" value="org.eclipse.cdt.managedbuilder.core.managedBuildNature"/>
+ <or>
+ <test property="org.eclipse.cdt.ui.checkPreference" value="org.eclipse.cdt.ui:properties.sd.page.enable="/>
+ <test property="org.eclipse.cdt.ui.checkPreference" value="org.eclipse.cdt.ui:properties.sd.page.enable=true"/>
+ </or>
+ </and>
+ </adapt>
</enabledWhen>
</page>
<page
@@ -201,15 +153,11 @@
category="org.eclipse.photran.managedbuilder.ui.properties.Page_head_build"
name="%Environment"
>
- <filter
- name="projectNature"
- value="org.eclipse.cdt.managedbuilder.core.managedBuildNature">
- </filter>
<enabledWhen>
- <or>
- <instanceof value="org.eclipse.core.resources.IProject"/>
- <instanceof value="org.eclipse.cdt.core.model.ICProject"/>
- </or>
+ <adapt type="org.eclipse.core.resources.IProject">
+ <test property="org.eclipse.core.resources.projectNature"
+ value="org.eclipse.cdt.managedbuilder.core.managedBuildNature"/>
+ </adapt>
</enabledWhen>
</page>

Back to the top