enablement

JPMoresmau · May 10, 2013 · 31cecac · 31cecac
1 parent 609ffe3
commit 31cecac
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 13 deletions.
diff --git a/net.sf.eclipsefp.haskell-feature/feature.xml b/net.sf.eclipsefp.haskell-feature/feature.xml
@@ -102,7 +102,7 @@ available at http://www.eclipse.org/legal/epl-v10.html.
          id="net.sf.eclipsefp.haskell.hugs"
          download-size="0"
          install-size="0"
-         version="2.3.1"
+         version="2.5.3.qualifier"
          unpack="false"/>
 
    <plugin
@@ -116,7 +116,7 @@ available at http://www.eclipse.org/legal/epl-v10.html.
          id="net.sf.eclipsefp.haskell.debug.ui"
          download-size="0"
          install-size="0"
-         version="2.5.1"
+         version="2.5.3.qualifier"
          unpack="false"/>
 
    <plugin

diff --git a/net.sf.eclipsefp.haskell.core/plugin.xml b/net.sf.eclipsefp.haskell.core/plugin.xml
@@ -178,13 +178,13 @@
             class="net.sf.eclipsefp.haskell.core.expressions.HaskellPropertyTester"
             id="net.sf.eclipsefp.haskell.core.expressions.HaskellPropertyTester">
       </propertyTester>
-      <propertyTester
+      <!--propertyTester
             properties="isProjectExecutable, isSourceFolder, isHaskellFile, isProjectTestSuite, hasProjectHLintBuilder, needsProjectHLintBuilder, hasProjectAlexBuilder, needsProjectAlexBuilder, hasProjectHappyBuilder, needsProjectHappyBuilder, hasProjectUuagcBuilder, needsProjectUuagcBuilder, isProjectYesod"
             namespace="net.sf.eclipsefp.haskell.core"
             type="org.eclipse.ui.IEditorInput"
             class="net.sf.eclipsefp.haskell.core.expressions.HaskellPropertyTester"
             id="net.sf.eclipsefp.haskell.core.expressions.HaskellPropertyTester">
-      </propertyTester>
+      </propertyTester-->
    </extension>
    <extension
          id="problem"

diff --git a/net.sf.eclipsefp.haskell.debug.ui/META-INF/MANIFEST.MF b/net.sf.eclipsefp.haskell.debug.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %bundleName
 Bundle-SymbolicName: net.sf.eclipsefp.haskell.debug.ui;singleton:=true
-Bundle-Version: 2.5.1
+Bundle-Version: 2.5.3.qualifier
 Bundle-Activator: net.sf.eclipsefp.haskell.debug.ui.internal.HaskellDebugUI
 Bundle-Vendor: %bundleVendor
 Require-Bundle: net.sf.eclipsefp.haskell.ghccompiler,

diff --git a/net.sf.eclipsefp.haskell.debug.ui/plugin.xml b/net.sf.eclipsefp.haskell.debug.ui/plugin.xml
@@ -233,9 +233,12 @@
                   </count>
                   <iterate>
                   	<or>
-                  	 <test
-                           property="net.sf.eclipsefp.haskell.core.isProjectExecutable">
-                     </test>
+                  	 <and>
+                  	 	<instanceof value="org.eclipse.core.resources.IResource"/>
+	                  	 <test
+	                           property="net.sf.eclipsefp.haskell.core.isProjectExecutable">
+	                     </test>
+                     </and>
                      <instanceof value="net.sf.eclipsefp.haskell.ui.internal.views.projectexplorer.ProjectExplorerStanza"/>
                      </or>
                   </iterate>
@@ -330,9 +333,11 @@
                         value="1">
                   </count>
                   <iterate>
+                   	<adapt type="org.eclipse.core.resources.IProject">
                      <test
                            property="net.sf.eclipsefp.haskell.core.isProjectTestSuite">
                      </test>
+                     </adapt>
                   </iterate>
                </with>
             </enablement>
@@ -356,9 +361,11 @@
                         value="1">
                   </count>
                   <iterate>
+                   <adapt type="org.eclipse.core.resources.IProject">
                      <test
                            property="net.sf.eclipsefp.haskell.core.isProjectTestSuite">
                      </test>
+                     </adapt>
                   </iterate>
                </with>
             </enablement>
@@ -382,9 +389,11 @@
                         value="1">
                   </count>
                   <iterate>
-                     <test
-                           property="net.sf.eclipsefp.haskell.core.isProjectExecutable">
-                     </test>
+                     <adapt type="org.eclipse.core.resources.IProject">
+	                  	 <test
+	                           property="net.sf.eclipsefp.haskell.core.isProjectExecutable">
+	                     </test>
+                     </adapt>
                   </iterate>
                </with>
             </enablement>

diff --git a/net.sf.eclipsefp.haskell.hugs/META-INF/MANIFEST.MF b/net.sf.eclipsefp.haskell.hugs/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-Name: %bundleName
 Bundle-SymbolicName: net.sf.eclipsefp.haskell.hugs;singleton:=true
-Bundle-Version: 2.3.1
+Bundle-Version: 2.5.3.qualifier
 Bundle-Activator: net.sf.eclipsefp.haskell.hugs.HugsPlugin
 Bundle-Vendor: %bundleVendor
 Bundle-Localization: plugin

diff --git a/net.sf.eclipsefp.haskell.hugs/plugin.xml b/net.sf.eclipsefp.haskell.hugs/plugin.xml
@@ -35,7 +35,10 @@
                <with variable="selection">
                  <count value="1" />
                  <iterate>
-                   <test property="net.sf.eclipsefp.haskell.core.isHaskellFile"/>
+                 	<and>
+                  	 	<instanceof value="org.eclipse.core.resources.IResource"/>
+                   		<test property="net.sf.eclipsefp.haskell.core.isHaskellFile"/>
+                   </and>
                  </iterate>
                </with>
             </enablement>