Comment/Uncomment bound to Ctrl+Shift+1; Fortran property pages (including managed build) fixed for CDT 4.0

5 files changed, 283 insertions, 3 deletions

diff --git a/org.eclipse.photran.managedbuilder.ui/plugin.properties b/org.eclipse.photran.managedbuilder.ui/plugin.properties
index f7dcf274..1e39dee3 100644
--- a/org.eclipse.photran.managedbuilder.ui/plugin.properties
+++ b/org.eclipse.photran.managedbuilder.ui/plugin.properties
@@ -14,3 +14,17 @@ providerName=Eclipse.org
 #The Resource Property page
 MngBuildProp.name=Fortran Build
 MngResourceProp.name=Fortran Build
+
+
+
+page.c.general=Fortran General
+
+## New CDT project model - property pages names
+page.c.build=Fortran Build
+CDTPathSymbolsProperty.name=Paths and symbols
+CDTExpPathSymbolsProperty.name=Export settings
+CDTBuildProperty.name=Settings
+CDTToolchainProperty.name=Tool chain editor
+CDTVariablesProperty.name=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 cde64bee..d4c2280e 100644
--- a/org.eclipse.photran.managedbuilder.ui/plugin.xml
+++ b/org.eclipse.photran.managedbuilder.ui/plugin.xml
@@ -4,7 +4,7 @@
 
    <extension
          point="org.eclipse.ui.propertyPages">
-      <page
+      <!--page
             objectClass="org.eclipse.core.resources.IProject"
             adaptable="true"
             name="%MngBuildProp.name"
@@ -25,7 +25,190 @@
 	               name="projectNature"
 	               value="org.eclipse.cdt.managedbuilder.core.managedBuildNature">
 	         </filter>
+      </page-->
+      
+         <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>            
+         <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>          
+         </enabledWhen>
+        </page>    
+        <page
+            class="org.eclipse.cdt.managedbuilder.ui.properties.Page_Variables"
+            id="org.eclipse.photran.managedbuilder.ui.properties.Page_Variables"
+            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>
+         </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>          
+         </enabledWhen>
+      </page>
+      
+      <page
+            class="org.eclipse.cdt.managedbuilder.ui.properties.Page_ExpPathAndSymb"
+            id="org.eclipse.photran.ui.newui.Page_ExpPathAndSymb"
+            category="org.eclipse.photran.ui.newui.Page_head_general"
+            name="%CDTExpPathSymbolsProperty.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"/>
+		    </or>
+                <test property="org.eclipse.cdt.ui.pageEnabled" value="export" />
+		    </and>          
+         </enabledWhen>
+      </page>
+
+      <page
+            class="org.eclipse.cdt.managedbuilder.ui.properties.Page_BuildSettings"
+            id="org.eclipse.photran.managedbuilder.ui.properties.Page_BuildSettings"
+            category="org.eclipse.photran.managedbuilder.ui.properties.Page_head_build"
+            name="%CDTBuildProperty.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>          
+         </enabledWhen>
+      </page>
+      <page
+            class="org.eclipse.cdt.managedbuilder.ui.properties.Page_ToolChain"
+            id="org.eclipse.photran.managedbuilder.ui.properties.Page_ToolChain"
+            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" />
+		    </and>          
+         </enabledWhen>
+      </page>
+
+      <page
+            class="org.eclipse.cdt.managedbuilder.ui.properties.Page_Discovery"
+            id="org.eclipse.photran.managedbuilder.ui.properties.Page_Discovery"
+            category="org.eclipse.photran.managedbuilder.ui.properties.Page_head_build"
+            name="%Discovery.options"
+            >
+         <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"/>
+
+		     <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>
+         </enabledWhen>
+      </page>
+      <page
+            class="org.eclipse.cdt.managedbuilder.ui.properties.Page_Environment"
+            id="org.eclipse.photran.managedbuilder.ui.properties.Page_Environment"
+            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>
+         </enabledWhen>
       </page>
+      
 
       <!--
           The specific IFile (below) property pages have been commented out in CDT?
diff --git a/org.eclipse.photran.ui.vpg/plugin.xml b/org.eclipse.photran.ui.vpg/plugin.xml
index 28b8c3e3..32db9412 100644
--- a/org.eclipse.photran.ui.vpg/plugin.xml
+++ b/org.eclipse.photran.ui.vpg/plugin.xml
@@ -78,9 +78,10 @@
       <page
             objectClass="org.eclipse.core.resources.IProject"
             adaptable="true"
-            name="Fortran Analysis/Refactoring"
+            name="Analysis/Refactoring"
             class="org.eclipse.photran.internal.ui.properties.SearchPathsPropertyPage"
-            id="org.eclipse.photran.ui.SearchPathsPropertyPage">
+            id="org.eclipse.photran.ui.SearchPathsPropertyPage"
+            category="org.eclipse.photran.ui.newui.Page_head_general">
          <!--filter
                name="nature"
                value="org.eclipse.cdt.managedbuilder.core.managedBuildNature">
diff --git a/org.eclipse.photran.ui/plugin.xml b/org.eclipse.photran.ui/plugin.xml
index e1a5ca0c..d834946f 100644
--- a/org.eclipse.photran.ui/plugin.xml
+++ b/org.eclipse.photran.ui/plugin.xml
@@ -164,6 +164,7 @@
 	        id="org.eclipse.photran.ui.BlockCommentEditorContribution">
 	     <action 
 	           label="Comment/Uncomment" 
+               definitionId="org.eclipse.photran.ui.CommentCommand"
 	           class="org.eclipse.photran.internal.ui.actions.FortranBlockCommentActionDelegate" 
 	           menubarPath="group.edit" 
 	           id="org.eclipse.photran.ui.BlockCommentMenuAction"/>
@@ -183,6 +184,29 @@
             name="Photran Block Comment">
       </command>
    </extension>
+   <extension point="org.eclipse.ui.actionSets">
+      <actionSet
+            label="Comment/Uncomment"
+            description="Comment/Uncomment"
+            visible="true"
+            id="org.eclipse.photran.ui.CommentUncomment">
+	     <action 
+	           label="Comment/Uncomment" 
+               menubarPath="edit/additions"
+               definitionId="org.eclipse.photran.ui.CommentCommand"
+	           class="org.eclipse.photran.internal.ui.actions.FortranBlockCommentActionDelegate" 
+	           id="org.eclipse.photran.ui.BlockCommentAction">
+	     </action>
+      </actionSet>
+   </extension>
+   <extension
+         point="org.eclipse.ui.actionSetPartAssociations">
+      <actionSetPartAssociation
+            targetID="org.eclipse.photran.ui.CommentUncomment">
+         <part id="org.eclipse.photran.ui.editor.FreeFormFortranEditor"/>
+         <part id="org.eclipse.photran.ui.editor.FixedFormFortranEditor"/>
+      </actionSetPartAssociation>      
+   </extension>
    <extension
             point="org.eclipse.ui.bindings">
       <!--  win32:  M1=CTRL,    M2=SHIFT, M3=ALT, M4=-
@@ -197,6 +221,13 @@
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
             contextId="org.eclipse.photran.ui.FortranEditorContext"
             commandId="org.eclipse.photran.ui.CommentCommand"/>
+        <!-- The above don't seem to work anymore... something else is taking over those keystrokes,
+             so install this one as well -->
+        <key
+            sequence="M1+M2+1"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+            contextId="org.eclipse.photran.ui.FortranEditorContext"
+            commandId="org.eclipse.photran.ui.CommentCommand"/>
    </extension>
 
    <!-- Define toggling a breakpoint as the default double-click action -->
@@ -253,4 +284,33 @@
             id="org.eclipse.photran.ui.FortranEditorPreferencePage">
       </page>
    </extension>
+
+   <!--=========================================-->
+   <!-- Fortran-specific project property pages -->
+   <!--=========================================-->
+   <extension
+         point="org.eclipse.ui.propertyPages">
+      <page
+            class="org.eclipse.photran.internal.ui.properties.Page_head_general"
+            id="org.eclipse.photran.ui.newui.Page_head_general"
+            name="Fortran General"
+            >
+         <filter
+               name="projectNature"
+               value="org.eclipse.cdt.core.cnature">
+         </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>          
+         </enabledWhen>
+      </page>
+    </extension>    
 </plugin>
diff --git a/org.eclipse.photran.ui/src/org/eclipse/photran/internal/ui/properties/Page_head_general.java b/org.eclipse.photran.ui/src/org/eclipse/photran/internal/ui/properties/Page_head_general.java
new file mode 100644
index 00000000..af2428d3
--- /dev/null
+++ b/org.eclipse.photran.ui/src/org/eclipse/photran/internal/ui/properties/Page_head_general.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2007 Intel 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Intel Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.photran.internal.ui.properties;
+
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.dialogs.PropertyPage;
+
+public class Page_head_general extends PropertyPage {
+	protected Control createContents(Composite parent) {
+		noDefaultAndApplyButton();
+		return parent;
+	}
+}